.github/ISSUE_TEMPLATE/game-bug-report.yaml

@@ -17,7 +17,7 @@ body:
 
         This repository does not provide support for game patches. If you are having issues with patches please refer to [Cheats and Patches Repository](https://github.com/shadps4-emu/ps4_cheats).
 
-        Before submitting an issue please check [Game Compatibility Repository](https://github.com/shadps4-compatibility/shadps4-game-compatibility) for the information about the status of the game.
+        Before submitting an issue please check [Game Compatibility Repository](https://github.com/shadps4-emu/shadps4-game-compatibility) for the information about the status of the game.
 
         Please make an effort to make sure your issue isn't already reported.
 
@@ -35,7 +35,7 @@ body:
           required: true
         - label: I have disabled all patches and cheats and the issue is still present.
           required: true
-        - label: I have all the required [system modules](https://github.com/shadps4-emu/shadPS4/wiki/I.-Quick-start-%5BUsers%5D#4-adding-modules) installed.
+        - label: I have all the required [system modules](https://github.com/shadps4-emu/shadps4-game-compatibility?tab=readme-ov-file#informations) installed.
           required: true
   - type: textarea
     id: desc

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Install
       run: |
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main'
+        sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main'
         sudo apt update
         sudo apt install clang-format-19
     - name: Build
@@ -76,13 +76,18 @@ jobs:
             ${{ env.cache-name }}-
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-sdl-cache-cmake-build
       with:
         append-timestamp: false
         key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
 
+    - name: Setup VS Environment
+      uses: ilammy/msvc-dev-cmd@v1.13.0
+      with:
+        arch: amd64
+
     - name: Configure CMake
       run: cmake --fresh -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
@@ -106,7 +111,7 @@ jobs:
     - name: Setup Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.9.1
+        version: 6.9.0
         host: windows
         target: desktop
         arch: win64_msvc2022_64
@@ -125,13 +130,18 @@ jobs:
             ${{ env.cache-name }}-
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-qt-cache-cmake-build
       with:
         append-timestamp: false
         key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
 
+    - name: Setup VS Environment
+      uses: ilammy/msvc-dev-cmd@v1.13.0
+      with:
+        arch: amd64
+
     - name: Configure CMake
       run: cmake --fresh -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_QT_GUI=ON -DENABLE_UPDATER=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
@@ -176,7 +186,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{runner.os}}-sdl-cache-cmake-build
       with:
@@ -218,16 +228,13 @@ jobs:
     - name: Setup Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.9.1
+        version: 6.9.0
         host: mac
         target: desktop
         arch: clang_64
         archives: qtbase qttools
         modules: qtmultimedia
-
+        
-    - name: Workaround Qt <=6.9.1 issue
-      run: sed -i '' '/target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_agl_fw_path})/d' ${{env.QT_ROOT_DIR}}/lib/cmake/Qt6/FindWrapOpenGL.cmake
-
     - name: Cache CMake Configuration
       uses: actions/cache@v4 
       env: 
@@ -240,7 +247,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{runner.os}}-qt-cache-cmake-build
       with:
@@ -274,13 +281,8 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Add LLVM repository
-      run: |
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main'
-
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 clang-19 mold build-essential libasound2-dev libpulse-dev libopenal-dev libudev-dev
+      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 clang build-essential libasound2-dev libpulse-dev libopenal-dev libudev-dev
 
     - name: Cache CMake Configuration
       uses: actions/cache@v4 
@@ -294,7 +296,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-sdl-cache-cmake-build
       with:
@@ -302,7 +304,7 @@ jobs:
         key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
 
     - name: Configure CMake
-      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=mold" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(nproc)
@@ -335,13 +337,8 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Add LLVM repository
-      run: |
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main'
-
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 clang-19 mold build-essential qt6-base-dev qt6-tools-dev qt6-multimedia-dev libasound2-dev libpulse-dev libopenal-dev libudev-dev
+      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 clang build-essential qt6-base-dev qt6-tools-dev qt6-multimedia-dev libasound2-dev libpulse-dev libopenal-dev libudev-dev
 
     - name: Cache CMake Configuration
       uses: actions/cache@v4 
@@ -355,7 +352,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-qt-cache-cmake-build
       with:
@@ -363,7 +360,7 @@ jobs:
         key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
 
     - name: Configure CMake
-      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=mold" -DENABLE_QT_GUI=ON -DENABLE_UPDATER=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_QT_GUI=ON -DENABLE_UPDATER=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(nproc)
@@ -388,7 +385,7 @@ jobs:
         submodules: recursive
 
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 gcc-14 mold build-essential libasound2-dev libpulse-dev libopenal-dev libudev-dev
+      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 gcc-14 build-essential libasound2-dev libpulse-dev libopenal-dev libudev-dev
 
     - name: Cache CMake Configuration
       uses: actions/cache@v4 
@@ -402,7 +399,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-sdl-gcc-cache-cmake-build
       with:
@@ -410,7 +407,7 @@ jobs:
         key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
 
     - name: Configure CMake
-      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=mold" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(nproc)
@@ -424,7 +421,7 @@ jobs:
         submodules: recursive
 
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 gcc-14 mold build-essential qt6-base-dev qt6-tools-dev qt6-multimedia-dev libasound2-dev libpulse-dev libopenal-dev libudev-dev
+      run: sudo apt-get update && sudo apt install -y libx11-dev libxext-dev libwayland-dev libdecor-0-dev libxkbcommon-dev libglfw3-dev libgles2-mesa-dev libfuse2 gcc-14 build-essential qt6-base-dev qt6-tools-dev qt6-multimedia-dev libasound2-dev libpulse-dev libopenal-dev libudev-dev
 
     - name: Cache CMake Configuration
       uses: actions/cache@v4 
@@ -438,7 +435,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-qt-gcc-cache-cmake-build
       with:
@@ -446,7 +443,7 @@ jobs:
         key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
 
     - name: Configure CMake
-      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=mold" -DENABLE_QT_GUI=ON -DENABLE_UPDATER=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+      run: cmake --fresh -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14 -DENABLE_QT_GUI=ON -DENABLE_UPDATER=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(nproc)
@@ -487,7 +484,7 @@ jobs:
       with:
         token: ${{ secrets.SHADPS4_TOKEN_REPO }}
         name: "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}"
-        tag: "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.fullhash }}"
+        tag: "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}"
         draft: false
         prerelease: true
         body: "Full Changelog: [${{ env.last_release_tag }}...${{ needs.get-info.outputs.shorthash }}](https://github.com/shadps4-emu/shadPS4/compare/${{ env.last_release_tag }}...${{ needs.get-info.outputs.fullhash }})"
@@ -523,14 +520,14 @@ jobs:
 
           # Check if release already exists and get ID
           release_id=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
-            "https://api.github.com/repos/$REPO/releases/tags/Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.fullhash }}" | jq -r '.id')
+            "https://api.github.com/repos/$REPO/releases/tags/Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}" | jq -r '.id')
 
           if [[ "$release_id" == "null" ]]; then
             echo "Creating release in $REPO for $filename"
             release_id=$(curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
               -H "Accept: application/vnd.github.v3+json" \
               -d '{
-                "tag_name": "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.fullhash }}",
+                "tag_name": "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}",
                 "name": "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}",
                 "draft": false,
                 "prerelease": true,

.gitmodules

@@ -30,6 +30,10 @@
 	path = externals/xbyak
 	url = https://github.com/herumi/xbyak.git
 	shallow = true
+[submodule "externals/winpthreads"]
+	path = externals/winpthreads
+	url = https://github.com/shadps4-emu/winpthreads.git
+	shallow = true
 [submodule "externals/magic_enum"]
 	path = externals/magic_enum
 	url = https://github.com/Neargye/magic_enum.git
@@ -103,9 +107,6 @@
 	path = externals/MoltenVK/cereal
 	url = https://github.com/USCiLab/cereal
 	shallow = true
-[submodule "externals/ext-libusb"]
+[submodule "externals/libusb"]
-	path = externals/ext-libusb
+	path = externals/libusb
-	url = https://github.com/shadps4-emu/ext-libusb.git
+	url = https://github.com/libusb/libusb-cmake.git
-[submodule "externals/epoll-shim"]
-	path = externals/epoll-shim
-	url = https://github.com/jiixyj/epoll-shim.git

CMakeLinuxPresets.json

@@ -1,21 +0,0 @@
-{
-  "version": 9,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 30,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "x64-Clang-Base",
-      "hidden": true,
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/Build/${presetName}",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/Build/${presetName}"
-      }
-    }
-  ]
-}

CMakeLists.txt

@@ -54,9 +54,9 @@ else()
 endif()
 
 if (ARCHITECTURE STREQUAL "x86_64")
-    # Target x86-64-v3 CPU architecture as this is a good balance between supporting performance critical
+    # Target the same CPU architecture as the PS4, to maintain the same level of compatibility.
-    # instructions like AVX2 and maintaining support for older CPUs.
+    # Exclude SSE4a as it is only available on AMD CPUs.
-    add_compile_options(-march=x86-64-v3)
+    add_compile_options(-march=btver2 -mtune=generic -mno-sse4a)
 endif()
 
 if (APPLE AND ARCHITECTURE STREQUAL "x86_64" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
@@ -126,7 +126,7 @@ execute_process(
 
 # If there's no upstream set or the command failed, check remote.pushDefault
 if (GIT_REMOTE_RESULT OR GIT_REMOTE_NAME STREQUAL "")
-  message(STATUS "check default push")
+  message("check default push")
   execute_process(
     COMMAND git config --get remote.pushDefault
     OUTPUT_VARIABLE GIT_REMOTE_NAME
@@ -134,30 +134,29 @@ if (GIT_REMOTE_RESULT OR GIT_REMOTE_NAME STREQUAL "")
     ERROR_QUIET
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  message(STATUS "got remote: ${GIT_REMOTE_NAME}")
 endif()
 
 # If running in GitHub Actions and the above fails
 if (GIT_REMOTE_RESULT OR GIT_REMOTE_NAME STREQUAL "")
-  message(STATUS "check github")
+  message("check github")
   set(GIT_REMOTE_NAME "origin")
 
   # Retrieve environment variables
   if (DEFINED ENV{GITHUB_HEAD_REF} AND NOT "$ENV{GITHUB_HEAD_REF}" STREQUAL "")
-    message(STATUS "github head ref: $ENV{GITHUB_HEAD_REF}")
+    message("github head ref: $ENV{GITHUB_HEAD_REF}")
     set(GITHUB_HEAD_REF "$ENV{GITHUB_HEAD_REF}")
   else()
     set(GITHUB_HEAD_REF "")
   endif()
 
   if (DEFINED ENV{GITHUB_REF} AND NOT "$ENV{GITHUB_REF}" STREQUAL "")
-    message(STATUS "github ref: $ENV{GITHUB_REF}")
+    message("github ref: $ENV{GITHUB_REF}")
     string(REGEX REPLACE "^refs/[^/]*/" "" GITHUB_BRANCH "$ENV{GITHUB_REF}")
     string(REGEX MATCH "refs/pull/([0-9]+)/merge" MATCHED_REF "$ENV{GITHUB_REF}")
     if (MATCHED_REF)
       set(PR_NUMBER "${CMAKE_MATCH_1}")
       set(GITHUB_BRANCH "")
-      message(STATUS "PR number: ${PR_NUMBER}")
+      message("PR number: ${PR_NUMBER}")
     else()
       set(PR_NUMBER "")
     endif()
@@ -178,8 +177,8 @@ if (GIT_REMOTE_RESULT OR GIT_REMOTE_NAME STREQUAL "")
     set(GIT_BRANCH "${GITHUB_BRANCH}")
   elseif ("${PR_NUMBER}" STREQUAL "" AND NOT "${GITHUB_REF}" STREQUAL "")
     set(GIT_BRANCH "${GITHUB_REF}")
-  elseif("${GIT_BRANCH}" STREQUAL "")
+  else()
-    message(STATUS "couldn't find branch")
+    message("couldn't find branch")
     set(GIT_BRANCH "detached-head")
   endif()
 else()
@@ -187,14 +186,14 @@ else()
   string(FIND "${GIT_REMOTE_NAME}" "/" INDEX)
   if (INDEX GREATER -1)
     string(SUBSTRING "${GIT_REMOTE_NAME}" 0 "${INDEX}" GIT_REMOTE_NAME)
-  elseif("${GIT_REMOTE_NAME}" STREQUAL "")
+  else()
-    message(STATUS "reset to origin")
+    # If no remote is present (only a branch name), default to origin
     set(GIT_REMOTE_NAME "origin")
   endif()
 endif()
 
 # Get remote link
-message(STATUS "getting remote link")
+message("getting remote link")
 execute_process(
   COMMAND git config --get remote.${GIT_REMOTE_NAME}.url
   OUTPUT_VARIABLE GIT_REMOTE_URL
@@ -203,26 +202,16 @@ execute_process(
 
 # Set Version
 set(EMULATOR_VERSION_MAJOR "0")
-set(EMULATOR_VERSION_MINOR "10")
+set(EMULATOR_VERSION_MINOR "8")
-set(EMULATOR_VERSION_PATCH "1")
+set(EMULATOR_VERSION_PATCH "0")
 
 set_source_files_properties(src/shadps4.rc PROPERTIES COMPILE_DEFINITIONS "EMULATOR_VERSION_MAJOR=${EMULATOR_VERSION_MAJOR};EMULATOR_VERSION_MINOR=${EMULATOR_VERSION_MINOR};EMULATOR_VERSION_PATCH=${EMULATOR_VERSION_PATCH}")
 
-set(APP_VERSION "${EMULATOR_VERSION_MAJOR}.${EMULATOR_VERSION_MINOR}.${EMULATOR_VERSION_PATCH} WIP")
+set(APP_VERSION "${EMULATOR_VERSION_MAJOR}.${EMULATOR_VERSION_MINOR}.${EMULATOR_VERSION_PATCH}")
-set(APP_IS_RELEASE false)
+set(APP_IS_RELEASE true)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/common/scm_rev.cpp" @ONLY)
 
-message("-- end git things, remote: ${GIT_REMOTE_NAME}, branch: ${GIT_BRANCH}, link: ${GIT_REMOTE_URL}")
+message("end git things, remote: ${GIT_REMOTE_NAME}, branch: ${GIT_BRANCH}")
-
-string(TOLOWER "${GIT_REMOTE_URL}" GIT_REMOTE_URL_LOWER)
-if(NOT GIT_REMOTE_URL_LOWER MATCHES "shadps4-emu/shadps4" OR NOT GIT_BRANCH STREQUAL "main")
-    message(STATUS "not main, disabling auto update")
-    set(ENABLE_UPDATER OFF)
-endif()
-
-if(WIN32 AND ENABLE_QT_GUI AND NOT CMAKE_PREFIX_PATH)
-    include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/DetectQtInstallation.cmake")
-endif ()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 find_package(Boost 1.84.0 CONFIG)
@@ -237,19 +226,26 @@ find_package(SDL3 3.1.2 CONFIG)
 find_package(stb MODULE)
 find_package(toml11 4.2.0 CONFIG)
 find_package(tsl-robin-map 1.3.0 CONFIG)
-find_package(VulkanHeaders 1.4.314 CONFIG)
+find_package(VulkanHeaders 1.4.309 CONFIG)
 find_package(VulkanMemoryAllocator 3.1.0 CONFIG)
 find_package(xbyak 7.07 CONFIG)
 find_package(xxHash 0.8.2 MODULE)
 find_package(ZLIB 1.3 MODULE)
 find_package(Zydis 5.0.0 CONFIG)
 find_package(pugixml 1.14 CONFIG)
+find_package(libusb 1.0.27 MODULE)
 if (APPLE)
     find_package(date 3.0.1 CONFIG)
-    find_package(epoll-shim 3.14 CONFIG)
 endif()
 list(POP_BACK CMAKE_MODULE_PATH)
 
+# Note: Windows always has these functions through winpthreads
+include(CheckSymbolExists)
+check_symbol_exists(pthread_mutex_timedlock "pthread.h" HAVE_PTHREAD_MUTEX_TIMEDLOCK)
+if(HAVE_PTHREAD_MUTEX_TIMEDLOCK OR WIN32)
+    add_compile_options(-DHAVE_PTHREAD_MUTEX_TIMEDLOCK)
+endif()
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     # libc++ requires -fexperimental-library to enable std::jthread and std::stop_token support.
     include(CheckCXXSymbolExists)
@@ -261,6 +257,7 @@ endif()
 
 add_subdirectory(externals)
 include_directories(src)
+include_directories(Resources)
 
 if(ENABLE_QT_GUI)
     find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent LinguistTools Network Multimedia)
@@ -305,10 +302,6 @@ set(AJM_LIB src/core/libraries/ajm/ajm.cpp
 
 set(AUDIO_LIB src/core/libraries/audio/audioin.cpp
               src/core/libraries/audio/audioin.h
-              src/core/libraries/audio/sdl_in.h
-              src/core/libraries/audio/sdl_in.cpp
-              src/core/libraries/voice/voice.cpp
-              src/core/libraries/voice/voice.h
               src/core/libraries/audio/audioout.cpp
               src/core/libraries/audio/audioout.h
               src/core/libraries/audio/audioout_backend.h
@@ -378,19 +371,11 @@ set(NETWORK_LIBS src/core/libraries/network/http.cpp
                  src/core/libraries/network/net_ctl_obj.cpp
                  src/core/libraries/network/net_ctl_obj.h
                  src/core/libraries/network/net_ctl_codes.h
-                 src/core/libraries/network/net_util.cpp
-                 src/core/libraries/network/net_util.h
-                 src/core/libraries/network/net_error.h
                  src/core/libraries/network/net.h
                  src/core/libraries/network/ssl.cpp
                  src/core/libraries/network/ssl.h
                  src/core/libraries/network/ssl2.cpp
                  src/core/libraries/network/ssl2.h
-                 src/core/libraries/network/sys_net.cpp
-                 src/core/libraries/network/sys_net.h
-                 src/core/libraries/network/posix_sockets.cpp
-                 src/core/libraries/network/p2p_sockets.cpp
-                 src/core/libraries/network/sockets.h
 )
 
 set(AVPLAYER_LIB src/core/libraries/avplayer/avplayer_common.cpp
@@ -423,7 +408,6 @@ set(SYSTEM_LIBS src/core/libraries/system/commondialog.cpp
                 src/core/libraries/save_data/save_memory.h
                 src/core/libraries/save_data/savedata.cpp
                 src/core/libraries/save_data/savedata.h
-                src/core/libraries/save_data/savedata_error.h
                 src/core/libraries/save_data/dialog/savedatadialog.cpp
                 src/core/libraries/save_data/dialog/savedatadialog.h
                 src/core/libraries/save_data/dialog/savedatadialog_ui.cpp
@@ -605,21 +589,8 @@ set(MISC_LIBS  src/core/libraries/screenshot/screenshot.cpp
                src/core/libraries/move/move.h
                src/core/libraries/ulobjmgr/ulobjmgr.cpp
                src/core/libraries/ulobjmgr/ulobjmgr.h
-               src/core/libraries/signin_dialog/signindialog.cpp
-               src/core/libraries/signin_dialog/signindialog.h
 )
 
-set(CAMERA_LIBS  src/core/libraries/camera/camera.cpp
-                 src/core/libraries/camera/camera.h
-                 src/core/libraries/camera/camera_error.h
-)
-
-set(COMPANION_LIBS  src/core/libraries/companion/companion_httpd.cpp
-                    src/core/libraries/companion/companion_httpd.h
-                    src/core/libraries/companion/companion_util.cpp
-                    src/core/libraries/companion/companion_util.h
-                    src/core/libraries/companion/companion_error.h
-)
 set(DEV_TOOLS src/core/devtools/layer.cpp
               src/core/devtools/layer.h
               src/core/devtools/options.cpp
@@ -637,8 +608,6 @@ set(DEV_TOOLS src/core/devtools/layer.cpp
               src/core/devtools/widget/imgui_memory_editor.h
               src/core/devtools/widget/memory_map.cpp
               src/core/devtools/widget/memory_map.h
-              src/core/devtools/widget/module_list.cpp
-              src/core/devtools/widget/module_list.h
               src/core/devtools/widget/reg_popup.cpp
               src/core/devtools/widget/reg_popup.h
               src/core/devtools/widget/reg_view.cpp
@@ -664,7 +633,6 @@ set(COMMON src/common/logging/backend.cpp
            src/common/arch.h
            src/common/assert.cpp
            src/common/assert.h
-           src/common/bit_array.h
            src/common/bit_field.h
            src/common/bounded_threadsafe_queue.h
            src/common/concepts.h
@@ -690,13 +658,9 @@ set(COMMON src/common/logging/backend.cpp
            src/common/path_util.h
            src/common/object_pool.h
            src/common/polyfill_thread.h
-           src/common/range_lock.h
            src/common/rdtsc.cpp
            src/common/rdtsc.h
-           src/common/recursive_lock.cpp
-           src/common/recursive_lock.h
            src/common/sha1.h
-           src/common/shared_first_mutex.h
            src/common/signal_context.h
            src/common/signal_context.cpp
            src/common/singleton.h
@@ -790,8 +754,6 @@ set(CORE src/core/aerolib/stubs.cpp
          ${FIBER_LIB}
          ${VDEC_LIB}
          ${VR_LIBS}
-         ${CAMERA_LIBS}
-         ${COMPANION_LIBS}
          ${DEV_TOOLS}
          src/core/debug_state.cpp
          src/core/debug_state.h
@@ -878,16 +840,13 @@ set(SHADER_RECOMPILER src/shader_recompiler/exception.h
                       src/shader_recompiler/ir/passes/identity_removal_pass.cpp
                       src/shader_recompiler/ir/passes/ir_passes.h
                       src/shader_recompiler/ir/passes/lower_buffer_format_to_raw.cpp
-                      src/shader_recompiler/ir/passes/lower_fp64_to_fp32.cpp
                       src/shader_recompiler/ir/passes/readlane_elimination_pass.cpp
                       src/shader_recompiler/ir/passes/resource_tracking_pass.cpp
                       src/shader_recompiler/ir/passes/ring_access_elimination.cpp
                       src/shader_recompiler/ir/passes/shader_info_collection_pass.cpp
                       src/shader_recompiler/ir/passes/shared_memory_barrier_pass.cpp
-                      src/shader_recompiler/ir/passes/shared_memory_simplify_pass.cpp
                       src/shader_recompiler/ir/passes/shared_memory_to_storage_pass.cpp
                       src/shader_recompiler/ir/passes/ssa_rewrite_pass.cpp
-                      src/shader_recompiler/ir/abstract_syntax_list.cpp
                       src/shader_recompiler/ir/abstract_syntax_list.h
                       src/shader_recompiler/ir/attribute.cpp
                       src/shader_recompiler/ir/attribute.h
@@ -927,10 +886,9 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp
                src/video_core/buffer_cache/buffer.h
                src/video_core/buffer_cache/buffer_cache.cpp
                src/video_core/buffer_cache/buffer_cache.h
-               src/video_core/buffer_cache/memory_tracker.h
+               src/video_core/buffer_cache/memory_tracker_base.h
                src/video_core/buffer_cache/range_set.h
-               src/video_core/buffer_cache/region_definitions.h
+               src/video_core/buffer_cache/word_manager.h
-               src/video_core/buffer_cache/region_manager.h
                src/video_core/renderer_vulkan/liverpool_to_vk.cpp
                src/video_core/renderer_vulkan/liverpool_to_vk.h
                src/video_core/renderer_vulkan/vk_common.cpp
@@ -967,10 +925,6 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp
                src/video_core/renderer_vulkan/host_passes/fsr_pass.h
                src/video_core/renderer_vulkan/host_passes/pp_pass.cpp
                src/video_core/renderer_vulkan/host_passes/pp_pass.h
-               src/video_core/texture_cache/blit_helper.cpp
-               src/video_core/texture_cache/blit_helper.h
-               src/video_core/texture_cache/host_compatibility.cpp
-               src/video_core/texture_cache/host_compatibility.h
                src/video_core/texture_cache/image.cpp
                src/video_core/texture_cache/image.h
                src/video_core/texture_cache/image_info.cpp
@@ -984,6 +938,7 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp
                src/video_core/texture_cache/tile_manager.cpp
                src/video_core/texture_cache/tile_manager.h
                src/video_core/texture_cache/types.h
+               src/video_core/texture_cache/host_compatibility.h
                src/video_core/page_manager.cpp
                src/video_core/page_manager.h
                src/video_core/multi_level_page_table.h
@@ -1072,12 +1027,6 @@ set(QT_GUI src/qt_gui/about_dialog.cpp
            src/qt_gui/settings_dialog.h
            src/qt_gui/settings_dialog.ui
            src/qt_gui/main.cpp
-           src/qt_gui/gui_settings.cpp
-           src/qt_gui/gui_settings.h
-           src/qt_gui/settings.cpp
-           src/qt_gui/settings.h
-           src/qt_gui/sdl_event_wrapper.cpp
-           src/qt_gui/sdl_event_wrapper.h
            ${EMULATOR}
            ${RESOURCE_FILES}
            ${TRANSLATIONS}
@@ -1128,54 +1077,55 @@ if (ENABLE_DISCORD_RPC)
     target_compile_definitions(shadps4 PRIVATE ENABLE_DISCORD_RPC)
 endif()
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+# Optional due to https://github.com/shadps4-emu/shadPS4/issues/1704
-    # Optional due to https://github.com/shadps4-emu/shadPS4/issues/1704
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ENABLE_USERFAULTFD)
-    if (ENABLE_USERFAULTFD)
+    target_compile_definitions(shadps4 PRIVATE ENABLE_USERFAULTFD)
-        target_compile_definitions(shadps4 PRIVATE ENABLE_USERFAULTFD)
-    endif()
-
-    target_link_libraries(shadps4 PRIVATE uuid)
 endif()
 
 if (APPLE)
     # Include MoltenVK, along with an ICD file so it can be found by the system Vulkan loader if used for loading layers.
-    if (ENABLE_QT_GUI)
+    set(MVK_DYLIB_SRC ${CMAKE_CURRENT_BINARY_DIR}/externals/MoltenVK/libMoltenVK.dylib)
-        set(MVK_BUNDLE_PATH "Resources/vulkan/icd.d")
-        set_property(TARGET shadps4 APPEND PROPERTY BUILD_RPATH "@executable_path/../${MVK_BUNDLE_PATH}")
-        set(MVK_DST ${CMAKE_CURRENT_BINARY_DIR}/shadps4.app/Contents/${MVK_BUNDLE_PATH})
 
-        add_custom_command(
+    if (ENABLE_QT_GUI)
-            OUTPUT ${MVK_DST}
+        set_property(TARGET shadps4 APPEND PROPERTY BUILD_RPATH "@executable_path/../Frameworks")
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${MVK_DST})
+        set(MVK_ICD_DST ${CMAKE_CURRENT_BINARY_DIR}/shadps4.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json)
+        set(MVK_DYLIB_DST ${CMAKE_CURRENT_BINARY_DIR}/shadps4.app/Contents/Frameworks/libMoltenVK.dylib)
+        set(MVK_DYLIB_ICD_PATH "../../../Frameworks/libMoltenVK.dylib")
     else()
         set_property(TARGET shadps4 APPEND PROPERTY BUILD_RPATH "@executable_path")
-        set(MVK_DST ${CMAKE_CURRENT_BINARY_DIR})
+        set(MVK_ICD_DST ${CMAKE_CURRENT_BINARY_DIR}/MoltenVK_icd.json)
+        set(MVK_DYLIB_DST ${CMAKE_CURRENT_BINARY_DIR}/libMoltenVK.dylib)
+        set(MVK_DYLIB_ICD_PATH "./libMoltenVK.dylib")
     endif()
 
-    set(MVK_DYLIB_SRC ${CMAKE_CURRENT_BINARY_DIR}/externals/MoltenVK/libMoltenVK.dylib)
+    cmake_path(GET MVK_ICD_DST PARENT_PATH MVK_ICD_DST_PARENT)
-    set(MVK_DYLIB_DST ${MVK_DST}/libMoltenVK.dylib)
+    cmake_path(GET MVK_DYLIB_DST PARENT_PATH MVK_DYLIB_DST_PARENT)
-    set(MVK_ICD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/externals/MoltenVK/MoltenVK/MoltenVK/icd/MoltenVK_icd.json)
-    set(MVK_ICD_DST ${MVK_DST}/MoltenVK_icd.json)
 
+    set(MVK_ICD "\\\{ \\\"file_format_version\\\": \\\"1.0.0\\\", \\\"ICD\\\": \\\{ \\\"library_path\\\": \\\"${MVK_DYLIB_ICD_PATH}\\\", \\\"api_version\\\": \\\"1.2.0\\\", \\\"is_portability_driver\\\": true \\\} \\\}")
     add_custom_command(
         OUTPUT ${MVK_ICD_DST}
-        DEPENDS ${MVK_ICD_SRC} ${MVK_DST}
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${MVK_ICD_DST_PARENT} && ${CMAKE_COMMAND} -E echo ${MVK_ICD} > ${MVK_ICD_DST})
-        COMMAND ${CMAKE_COMMAND} -E copy ${MVK_ICD_SRC} ${MVK_ICD_DST})
+
     add_custom_command(
         OUTPUT ${MVK_DYLIB_DST}
-        DEPENDS ${MVK_DYLIB_SRC} ${MVK_DST}
+        DEPENDS ${MVK_DYLIB_SRC}
-        COMMAND ${CMAKE_COMMAND} -E copy ${MVK_DYLIB_SRC} ${MVK_DYLIB_DST})
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${MVK_DYLIB_DST_PARENT} && ${CMAKE_COMMAND} -E copy ${MVK_DYLIB_SRC} ${MVK_DYLIB_DST})
+
     add_custom_target(CopyMoltenVK DEPENDS ${MVK_ICD_DST} ${MVK_DYLIB_DST})
     add_dependencies(CopyMoltenVK MoltenVK)
     add_dependencies(shadps4 CopyMoltenVK)
 
     if (ARCHITECTURE STREQUAL "x86_64")
         # Reserve system-managed memory space.
-        target_link_options(shadps4 PRIVATE -Wl,-ld_classic,-no_pie,-no_fixup_chains,-no_huge,-pagezero_size,0x4000,-segaddr,TCB_SPACE,0x4000,-segaddr,SYSTEM_MANAGED,0x400000,-segaddr,SYSTEM_RESERVED,0x7FFFFC000,-image_base,0x20000000000)
+        target_link_options(shadps4 PRIVATE -Wl,-no_pie,-no_fixup_chains,-no_huge,-pagezero_size,0x4000,-segaddr,TCB_SPACE,0x4000,-segaddr,SYSTEM_MANAGED,0x400000,-segaddr,SYSTEM_RESERVED,0x7FFFFC000,-image_base,0x20000000000)
     endif()
 
     # Replacement for std::chrono::time_zone
-    target_link_libraries(shadps4 PRIVATE date::date-tz epoll-shim)
+    target_link_libraries(shadps4 PRIVATE date::date-tz)
+endif()
+
+if (NOT ENABLE_QT_GUI)
+  target_link_libraries(shadps4 PRIVATE SDL3::SDL3)
 endif()
 
 if (ENABLE_QT_GUI)
@@ -1187,7 +1137,7 @@ if (ENABLE_QT_GUI)
 endif()
 
 if (WIN32)
-    target_link_libraries(shadps4 PRIVATE mincore)
+    target_link_libraries(shadps4 PRIVATE mincore winpthreads)
 
     if (MSVC)
         # MSVC likes putting opinions on what people can use, disable:
@@ -1244,7 +1194,6 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeRC.cmake")
 cmrc_add_resource_library(embedded-resources
         ALIAS res::embedded
         NAMESPACE res
-	src/images/trophy.wav
         src/images/bronze.png
         src/images/gold.png
         src/images/platinum.png

CMakePresets.json

@@ -1,62 +0,0 @@
-{
-  "version": 9,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 30,
-    "patch": 0
-  },
-  "include": ["CMake${hostSystemName}Presets.json"],
-  "configurePresets": [
-    {
-      "name": "x64-Clang-Debug",
-      "displayName": "Clang x64 Debug",
-      "inherits": ["x64-Clang-Base"],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "x64-Clang-Debug-Qt",
-      "displayName": "Clang x64 Debug with Qt",
-      "inherits": ["x64-Clang-Base"],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "ENABLE_QT_GUI": "ON"
-      }
-    },
-    {
-      "name": "x64-Clang-Release",
-      "displayName": "Clang x64 Release",
-      "inherits": ["x64-Clang-Base"],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
-    },
-    {
-      "name": "x64-Clang-Release-Qt",
-      "displayName": "Clang x64 Release with Qt",
-      "inherits": ["x64-Clang-Base"],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "ENABLE_QT_GUI": "ON"
-      }
-    },
-    {
-      "name": "x64-Clang-RelWithDebInfo",
-      "displayName": "Clang x64 RelWithDebInfo",
-      "inherits": ["x64-Clang-Base"],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "x64-Clang-RelWithDebInfo-Qt",
-      "displayName": "Clang x64 RelWithDebInfo with Qt",
-      "inherits": ["x64-Clang-Base"],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "ENABLE_QT_GUI": "ON"
-      }
-    }
-  ]
-}

CMakeSettings.json

@@ -12,18 +12,6 @@
       "inheritEnvironments": [ "clang_cl_x64_x64" ],
       "intelliSenseMode": "windows-clang-x64"
     },
-    {
-      "name": "x64-Clang-Release-Qt",
-      "generator": "Ninja",
-      "configurationType": "Release",
-      "buildRoot": "${projectDir}\\Build\\${name}",
-      "installRoot": "${projectDir}\\Install\\${name}",
-      "cmakeCommandArgs": "-DENABLE_QT_GUI=ON",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "clang_cl_x64_x64" ],
-      "intelliSenseMode": "windows-clang-x64"
-    },
     {
       "name": "x64-Clang-Debug",
       "generator": "Ninja",
@@ -36,18 +24,6 @@
       "inheritEnvironments": [ "clang_cl_x64_x64" ],
       "intelliSenseMode": "windows-clang-x64"
     },
-    {
-      "name": "x64-Clang-Debug-Qt",
-      "generator": "Ninja",
-      "configurationType": "Debug",
-      "buildRoot": "${projectDir}\\Build\\${name}",
-      "installRoot": "${projectDir}\\Install\\${name}",
-      "cmakeCommandArgs": "-DENABLE_QT_GUI=ON",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "clang_cl_x64_x64" ],
-      "intelliSenseMode": "windows-clang-x64"
-    },
     {
       "name": "x64-Clang-RelWithDebInfo",
       "generator": "Ninja",
@@ -59,18 +35,6 @@
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "clang_cl_x64_x64" ],
       "intelliSenseMode": "windows-clang-x64"
-    },
-    {
-      "name": "x64-Clang-RelWithDebInfo-Qt",
-      "generator": "Ninja",
-      "configurationType": "RelWithDebInfo",
-      "buildRoot": "${projectDir}\\Build\\${name}",
-      "installRoot": "${projectDir}\\Install\\${name}",
-      "cmakeCommandArgs": "-DENABLE_QT_GUI=ON",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "clang_cl_x64_x64" ],
-      "intelliSenseMode": "windows-clang-x64"
     }
   ]
 }

CMakeWindowsPresets.json

@@ -1,26 +0,0 @@
-{
-  "version": 9,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 30,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "x64-Clang-Base",
-      "hidden": true,
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/Build/${presetName}",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang-cl",
-        "CMAKE_CXX_COMPILER": "clang-cl",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/Build/${presetName}"
-      },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "intelliSenseMode": "windows-clang-x64"
-        }
-      }
-    }
-  ]
-}

README.md

@@ -36,8 +36,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 **shadPS4** is an early **PlayStation 4** emulator for **Windows**, **Linux** and **macOS** written in C++.
 
-If you encounter problems or have doubts, do not hesitate to look at the [**Quickstart**](https://github.com/shadps4-emu/shadPS4/wiki/I.-Quick-start-%5BUsers%5D).\
+If you encounter problems or have doubts, do not hesitate to look at the [**Quickstart**](https://github.com/shadps4-emu/shadPS4/blob/main/documents/Quickstart/Quickstart.md).\
-To verify that a game works, you can look at [**shadPS4 Game Compatibility**](https://github.com/shadps4-compatibility/shadps4-game-compatibility).\
+To verify that a game works, you can look at [**shadPS4 Game Compatibility**](https://github.com/shadps4-emu/shadps4-game-compatibility).\
 To discuss shadPS4 development, suggest ideas or to ask for help, join our [**Discord server**](https://discord.gg/bFJxfftGW6).\
 To get the latest news, go to our [**X (Twitter)**](https://x.com/shadps4) or our [**website**](https://shadps4.net/).\
 For those who'd like to donate to the project, we now have a [**Kofi page**](https://ko-fi.com/shadps4)!
@@ -124,8 +124,8 @@ Keyboard and mouse inputs can be customized in the settings menu by clicking the
 
 # Firmware files
 
-shadPS4 can load some PlayStation 4 firmware files, these must be dumped from your legally owned PlayStation 4 console.
+shadPS4 can load some PlayStation 4 firmware files, these must be dumped from your legally owned PlayStation 4 console.\
-The following firmware modules are supported and must be placed in shadPS4's `sys_modules` folder.
+The following firmware modules are supported and must be placed in shadPS4's `user/sys_modules` folder.
 
 <div align="center">
 
@@ -138,7 +138,8 @@ The following firmware modules are supported and must be placed in shadPS4's `sy
 </div>
 
 > [!Caution]
-> The above modules are required to run the games properly and must be extracted from your PlayStation 4.
+> The above modules are required to run the games properly and must be extracted from your PlayStation 4.\
+> **We do not provide any information or support on how to do this**.
 
 
 
@@ -147,7 +148,7 @@ The following firmware modules are supported and must be placed in shadPS4's `sy
 - [**georgemoralis**](https://github.com/georgemoralis)
 - [**psucien**](https://github.com/psucien)
 - [**viniciuslrangel**](https://github.com/viniciuslrangel)
-- [**roamic**](https://github.com/roamic)
+- [**roamic**](https://github.com/vladmikhalin)
 - [**squidbus**](https://github.com/squidbus)
 - [**frodo**](https://github.com/baggins183)
 - [**Stephen Miller**](https://github.com/StevenMiller123)
@@ -157,7 +158,7 @@ Logo is done by [**Xphalnos**](https://github.com/Xphalnos)
 
 # Contributing
 
-If you want to contribute, please read the [**CONTRIBUTING.md**](https://github.com/shadps4-emu/shadPS4/blob/main/CONTRIBUTING.md) file.\
+If you want to contribute, please look the [**CONTRIBUTING.md**](https://github.com/shadps4-emu/shadPS4/blob/main/CONTRIBUTING.md) file.\
 Open a PR and we'll check it :)
 
 # Translations

REUSE.toml

@@ -5,13 +5,10 @@ path = [
     "REUSE.toml",
     "crowdin.yml",
     "CMakeSettings.json",
-    "CMakeLinuxPresets.json",
-    "CMakeWindowsPresets.json",
-    "CMakePresets.json",
     ".github/FUNDING.yml",
     ".github/shadps4.png",
-    ".github/workflows/scripts/update_translation.sh",
+	".github/workflows/scripts/update_translation.sh",
-    ".github/workflows/update_translation.yml",
+	".github/workflows/update_translation.yml",
     ".gitmodules",
     "dist/MacOSBundleInfo.plist.in",
     "dist/net.shadps4.shadPS4.desktop",
@@ -32,7 +29,6 @@ path = [
     "src/images/discord.png",
     "src/images/dump_icon.png",
     "src/images/exit_icon.png",
-    "src/images/favorite_icon.png",
     "src/images/file_icon.png",
     "src/images/trophy_icon.png",
     "src/images/flag_china.png",
@@ -73,10 +69,9 @@ path = [
     "src/images/shadps4.svg",
     "src/images/website.svg",
     "src/images/youtube.svg",
-    "src/images/trophy.wav",
     "src/shadps4.qrc",
     "src/shadps4.rc",
-    "src/qt_gui/translations/update_translation.sh",
+	"src/qt_gui/translations/update_translation.sh",
 ]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "shadPS4 Emulator Project"

cmake/DetectQtInstallation.cmake

@@ -1,28 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(highest_version "0")
-set(CANDIDATE_DRIVES 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)
-
-foreach(drive ${CANDIDATE_DRIVES})
-    file(GLOB kits LIST_DIRECTORIES true CONFIGURE_DEPENDS "${drive}:/Qt/*/msvc*_64")
-    foreach(kit IN LISTS kits)
-        get_filename_component(version_dir "${kit}" DIRECTORY)
-        get_filename_component(kit_version "${version_dir}" NAME)
-
-        message(STATUS "DetectQtInstallation.cmake: Detected Qt: ${kit}")
-
-        if (kit_version VERSION_GREATER highest_version)
-            set(highest_version "${kit_version}")
-            set(QT_PREFIX "${kit}")
-
-        endif()
-    endforeach()
-endforeach()
-
-if(QT_PREFIX)
-    set(CMAKE_PREFIX_PATH "${QT_PREFIX}" CACHE PATH "Qt prefix auto‑detected" FORCE)
-    message(STATUS "DetectQtInstallation.cmake: Choose newest Qt: ${QT_PREFIX}")
-else()
-    message(STATUS "DetectQtInstallation.cmake: No Qt‑Directory found in <drive>:/Qt – please set CMAKE_PREFIX_PATH manually")
-endif()

dist/net.shadps4.shadPS4.metainfo.xml

@@ -37,13 +37,7 @@
     <category translate="no">Game</category>
   </categories>
   <releases>
-    <release version="0.10.0" date="2025-07-06">
+  	<release version="0.8.0" date="2025-05-23">
-      <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.10.0</url>
-    </release>
-    <release version="0.9.0" date="2025-05-22">
-      <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.9.0</url>
-    </release>
-  	<release version="0.8.0" date="2025-04-23">
       <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.8.0</url>
     </release>
 	<release version="0.7.0" date="2025-03-23">

documents/Debugging/Debugging.md

@@ -147,7 +147,7 @@ Accurately identifying games will help other developers that own that game recog
 - If your issue is small or you aren't sure whether you have properly identified something, [join the Discord server](https://discord.gg/MyZRaBngxA) and use the #development channel
   to concisely explain the issue, as well as any findings you currently have.
 
-- It is recommended that you check the [game compatibility issue tracker](https://github.com/shadps4-compatibility/shadps4-game-compatibility/issues) and post very short summaries of progress changes there,
+- It is recommended that you check the [game compatibility issue tracker](https://github.com/shadps4-emu/shadps4-game-compatibility/issues) and post very short summaries of progress changes there,
   (such as the game now booting into the menu or getting in-game) for organizational and status update purposes.
   
 - ⚠ **Do not post theoretical, unproven game-specific issues in the emulator issue tracker that you cannot verify and locate in the emulator source code as being a bug.**\

documents/Quickstart/Quickstart.md

@@ -0,0 +1,58 @@
+<!--
+SPDX-FileCopyrightText: 2024 shadPS4 Emulator Project
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
+
+# shadPS4 Quickstart
+
+## Summary
+
+- [**PC Requirements**](#minimum-pc-requirements)
+   - [**CPU**](#cpu)
+   - [**GPU**](#gpu)
+   - [**RAM**](#ram)
+   - [**OS**](#os)
+- [**Have the latest WIP version**](#how-to-run-the-latest-work-in-progress-builds-of-shadps4)
+- [**Configure the emulator**](#configure-the-emulator)
+
+## Minimum PC requirements
+
+### CPU
+
+- A processor with at least 4 cores and 6 threads
+- Above 2.5 GHz frequency
+- A CPU supporting the following instruction sets: MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, F16C, CLMUL, AES, BMI1, MOVBE, XSAVE, ABM
+  - **Intel**: Haswell generation or newer
+  - **AMD**: Jaguar generation or newer
+  - **Apple**: Rosetta 2 on macOS 15.4 or newer
+
+### GPU
+
+- A graphics card with at least 1GB of VRAM
+- Up-to-date graphics drivers
+- Vulkan 1.3 with the `VK_KHR_swapchain` and `VK_KHR_push_descriptor` extensions
+
+### RAM
+
+- 8GB of RAM or more
+
+### OS
+
+- Windows 10 or Ubuntu 22.04
+
+## How to run the latest Work-in-Progress builds of shadPS4
+
+1. Go to <https://github.com/shadps4-emu/shadPS4/releases> In the release identified as 'pre-release' click on the down arrow(Assets), select your operating system of choice (the "**qt**" versions have a user interface, which is probably the one you want. The others are SDL versions, which can only be run via command line).
+![image](https://github.com/user-attachments/assets/af520c77-797c-41a0-8f67-d87f5de3e3df)
+
+2. Once downloaded, extract to its own folder, and run shadPS4's executable from the extracted folder.
+
+3. Upon first launch, shadPS4 will prompt you to select a folder to store your installed games in. Select "Browse" and then select a folder that contains your dumped games.
+
+## Configure the emulator
+
+To configure the emulator, you can go through the interface and go to "settings".
+
+You can also configure the emulator by editing the `config.toml` file located in the `user` folder created after the application is started (Mostly useful if you are using the SDL version).
+Some settings may be related to more technical development and debugging.\
+For more information on this, see [**Debugging**](https://github.com/shadps4-emu/shadPS4/blob/main/documents/Debugging/Debugging.md#configuration).

documents/building-linux.md

@@ -25,11 +25,11 @@ sudo apt install build-essential clang git cmake libasound2-dev \
 
 ```bash
 sudo dnf install clang git cmake libatomic alsa-lib-devel \
-    pipewire-jack-audio-connection-kit-devel openal-soft-devel \
+    pipewire-jack-audio-connection-kit-devel openal-devel \
     openssl-devel libevdev-devel libudev-devel libXext-devel \
     qt6-qtbase-devel qt6-qtbase-private-devel \
     qt6-qtmultimedia-devel qt6-qtsvg-devel qt6-qttools-devel \
-    vulkan-devel vulkan-validation-layers libpng-devel libuuid-devel
+    vulkan-devel vulkan-validation-layers libpng-devel
 ```
 
 #### Arch Linux
@@ -74,7 +74,6 @@ and install the dependencies on that container as cited above.
 This option is **highly recommended** for distributions with immutable/atomic filesystems (example: Fedora Kinoite, SteamOS).
 
 ### Cloning
-The project uses submodules to manage dependencies, and they need to be initialized before you can build the project. To achieve this, make sure you've cloned the repository with the --recursive flag
 
 ```bash
 git clone --recursive https://github.com/shadps4-emu/shadPS4.git

externals/CMakeLists.txt

@@ -137,6 +137,12 @@ if (NOT TARGET Zydis::Zydis)
     add_subdirectory(zydis)
 endif()
 
+# Winpthreads
+if (WIN32)
+    add_subdirectory(winpthreads)
+    target_include_directories(winpthreads INTERFACE winpthreads/include)
+endif()
+
 # sirit
 add_subdirectory(sirit)
 if (WIN32)
@@ -197,7 +203,7 @@ endif()
 
 # libusb
 if (NOT TARGET libusb::usb)
-    add_subdirectory(ext-libusb)
+    add_subdirectory(libusb)
     add_library(libusb::usb ALIAS usb-1.0)
 endif()
 
@@ -229,8 +235,4 @@ if (APPLE)
     if (NOT TARGET MoltenVK)
         add_subdirectory(MoltenVK)
     endif()
-
-    if (NOT TARGET epoll-shim)
-        add_subdirectory(epoll-shim)
-    endif()
 endif()

externals/MoltenVK/MoltenVK

@@ -1 +1 @@
-Subproject commit 00abd384ce01cbd439045905d2fa6cf799dfa2f6
+Subproject commit 4cf8f94684c53e581eb9cc694dd3305d1f7d9959

externals/MoltenVK/SPIRV-Cross

@@ -1 +1 @@
-Subproject commit 1a69a919fa302e92b337594bd0a8aaea61037d91
+Subproject commit 2275d0efc4f2fa46851035d9d3c67c105bc8b99e

externals/epoll-shim

@@ -1 +0,0 @@
-Subproject commit 18159584bb3d17e601b9315a7398ace018251bdc

externals/ext-libusb

@@ -1 +0,0 @@
-Subproject commit e1f4ac1472bdf6aab27f8b836a2f47df85465bac

externals/libusb

@@ -0,0 +1 @@
+Subproject commit a63a7e43e0950a595cf4b98a0eaf4051749ace5f

externals/sdl3

@@ -1 +1 @@
-Subproject commit 86b206dadf8ad40e6657fa37db371a0aeff74e9c
+Subproject commit 4093e4a193971ef1d4928158e0a1832be42e4599

externals/sirit

@@ -1 +1 @@
-Subproject commit 282083a595dcca86814dedab2f2b0363ef38f1ec
+Subproject commit 427a42c9ed99b38204d9107bc3dc14e92458acf1

externals/vulkan-headers

@@ -1 +1 @@
-Subproject commit 9c77de5c3dd216f28e407eec65ed9c0a296c1f74
+Subproject commit 5ceb9ed481e58e705d0d9b5326537daedd06b97d

externals/winpthreads

@@ -0,0 +1 @@
+Subproject commit f35b0948d36a736e6a2d052ae295a3ffde09703f

src/common/adaptive_mutex.h

@@ -18,9 +18,6 @@ public:
     void unlock() {
         pthread_mutex_unlock(&mutex);
     }
-    [[nodiscard]] bool try_lock() {
-        return pthread_mutex_trylock(&mutex) == 0;
-    }
 
 private:
     pthread_mutex_t mutex = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;

src/common/bit_array.h

@@ -1,406 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-#include <cstddef>
-#include "common/types.h"
-
-#ifdef __AVX2__
-#define BIT_ARRAY_USE_AVX
-#include <immintrin.h>
-#endif
-
-namespace Common {
-
-template <size_t N>
-class BitArray {
-    static_assert(N % 64 == 0, "BitArray size must be a multiple of 64 bits.");
-
-    static constexpr size_t BITS_PER_WORD = 64;
-    static constexpr size_t WORD_COUNT = N / BITS_PER_WORD;
-    static constexpr size_t WORDS_PER_AVX = 4;
-    static constexpr size_t AVX_WORD_COUNT = WORD_COUNT / WORDS_PER_AVX;
-
-public:
-    using Range = std::pair<size_t, size_t>;
-
-    class Iterator {
-    public:
-        explicit Iterator(const BitArray& bit_array_, u64 start) : bit_array(bit_array_) {
-            range = bit_array.FirstRangeFrom(start);
-        }
-
-        Iterator& operator++() {
-            range = bit_array.FirstRangeFrom(range.second);
-            return *this;
-        }
-
-        bool operator==(const Iterator& other) const {
-            return range == other.range;
-        }
-
-        bool operator!=(const Iterator& other) const {
-            return !(*this == other);
-        }
-
-        const Range& operator*() const {
-            return range;
-        }
-
-        const Range* operator->() const {
-            return &range;
-        }
-
-    private:
-        const BitArray& bit_array;
-        Range range;
-    };
-
-    using const_iterator = Iterator;
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = Range;
-    using difference_type = std::ptrdiff_t;
-    using pointer = const Range*;
-    using reference = const Range&;
-
-    BitArray() = default;
-    BitArray(const BitArray& other) = default;
-    BitArray& operator=(const BitArray& other) = default;
-    BitArray(BitArray&& other) noexcept = default;
-    BitArray& operator=(BitArray&& other) noexcept = default;
-    ~BitArray() = default;
-
-    BitArray(const BitArray& other, size_t start, size_t end) {
-        if (start >= end || end > N) {
-            return;
-        }
-        const size_t first_word = start / BITS_PER_WORD;
-        const size_t last_word = (end - 1) / BITS_PER_WORD;
-        const size_t start_bit = start % BITS_PER_WORD;
-        const size_t end_bit = (end - 1) % BITS_PER_WORD;
-        const u64 start_mask = ~((1ULL << start_bit) - 1);
-        const u64 end_mask = end_bit == BITS_PER_WORD - 1 ? ~0ULL : (1ULL << (end_bit + 1)) - 1;
-        if (first_word == last_word) {
-            data[first_word] = other.data[first_word] & (start_mask & end_mask);
-        } else {
-            data[first_word] = other.data[first_word] & start_mask;
-            size_t i = first_word + 1;
-#ifdef BIT_ARRAY_USE_AVX
-            for (; i + WORDS_PER_AVX <= last_word; i += WORDS_PER_AVX) {
-                const __m256i current =
-                    _mm256_loadu_si256(reinterpret_cast<const __m256i*>(&other.data[i]));
-                _mm256_storeu_si256(reinterpret_cast<__m256i*>(&data[i]), current);
-            }
-#endif
-            for (; i < last_word; ++i) {
-                data[i] = other.data[i];
-            }
-            data[last_word] = other.data[last_word] & end_mask;
-        }
-    }
-
-    BitArray(const BitArray& other, const Range& range)
-        : BitArray(other, range.first, range.second) {}
-
-    const_iterator begin() const {
-        return Iterator(*this, 0);
-    }
-    const_iterator end() const {
-        return Iterator(*this, N);
-    }
-
-    inline constexpr void Set(size_t idx) {
-        data[idx / BITS_PER_WORD] |= (1ULL << (idx % BITS_PER_WORD));
-    }
-
-    inline constexpr void Unset(size_t idx) {
-        data[idx / BITS_PER_WORD] &= ~(1ULL << (idx % BITS_PER_WORD));
-    }
-
-    inline constexpr bool Get(size_t idx) const {
-        return (data[idx / BITS_PER_WORD] & (1ULL << (idx % BITS_PER_WORD))) != 0;
-    }
-
-    inline void SetRange(size_t start, size_t end) {
-        if (start >= end || end > N) {
-            return;
-        }
-        const size_t first_word = start / BITS_PER_WORD;
-        const size_t last_word = (end - 1) / BITS_PER_WORD;
-        const size_t start_bit = start % BITS_PER_WORD;
-        const size_t end_bit = (end - 1) % BITS_PER_WORD;
-        const u64 start_mask = ~((1ULL << start_bit) - 1);
-        const u64 end_mask = end_bit == BITS_PER_WORD - 1 ? ~0ULL : (1ULL << (end_bit + 1)) - 1;
-        if (first_word == last_word) {
-            data[first_word] |= start_mask & end_mask;
-        } else {
-            data[first_word] |= start_mask;
-            size_t i = first_word + 1;
-#ifdef BIT_ARRAY_USE_AVX
-            const __m256i value = _mm256_set1_epi64x(-1);
-            for (; i + WORDS_PER_AVX <= last_word; i += WORDS_PER_AVX) {
-                _mm256_storeu_si256(reinterpret_cast<__m256i*>(&data[i]), value);
-            }
-#endif
-            for (; i < last_word; ++i) {
-                data[i] = ~0ULL;
-            }
-            data[last_word] |= end_mask;
-        }
-    }
-
-    inline void UnsetRange(size_t start, size_t end) {
-        if (start >= end || end > N) {
-            return;
-        }
-        size_t first_word = start / BITS_PER_WORD;
-        const size_t last_word = (end - 1) / BITS_PER_WORD;
-        const size_t start_bit = start % BITS_PER_WORD;
-        const size_t end_bit = (end - 1) % BITS_PER_WORD;
-        const u64 start_mask = (1ULL << start_bit) - 1;
-        const u64 end_mask = end_bit == BITS_PER_WORD - 1 ? 0ULL : ~((1ULL << (end_bit + 1)) - 1);
-        if (first_word == last_word) {
-            data[first_word] &= start_mask | end_mask;
-        } else {
-            data[first_word] &= start_mask;
-            size_t i = first_word + 1;
-#ifdef BIT_ARRAY_USE_AVX
-            const __m256i value = _mm256_setzero_si256();
-            for (; i + WORDS_PER_AVX <= last_word; i += WORDS_PER_AVX) {
-                _mm256_storeu_si256(reinterpret_cast<__m256i*>(&data[i]), value);
-            }
-#endif
-            for (; i < last_word; ++i) {
-                data[i] = 0ULL;
-            }
-            data[last_word] &= end_mask;
-        }
-    }
-
-    inline constexpr void SetRange(const Range& range) {
-        SetRange(range.first, range.second);
-    }
-
-    inline constexpr void UnsetRange(const Range& range) {
-        UnsetRange(range.first, range.second);
-    }
-
-    inline constexpr void Clear() {
-        data.fill(0);
-    }
-
-    inline constexpr void Fill() {
-        data.fill(~0ULL);
-    }
-
-    inline constexpr bool None() const {
-        u64 result = 0;
-        for (const auto& word : data) {
-            result |= word;
-        }
-        return result == 0;
-    }
-
-    inline constexpr bool Any() const {
-        return !None();
-    }
-
-    Range FirstRangeFrom(size_t start) const {
-        if (start >= N) {
-            return {N, N};
-        }
-        const auto find_end_bit = [&](size_t word) {
-#ifdef BIT_ARRAY_USE_AVX
-            const __m256i all_one = _mm256_set1_epi64x(-1);
-            for (; word + WORDS_PER_AVX <= WORD_COUNT; word += WORDS_PER_AVX) {
-                const __m256i current =
-                    _mm256_loadu_si256(reinterpret_cast<const __m256i*>(&data[word]));
-                const __m256i cmp = _mm256_cmpeq_epi64(current, all_one);
-                if (_mm256_movemask_epi8(cmp) != 0xFFFFFFFF) {
-                    break;
-                }
-            }
-#endif
-            for (; word < WORD_COUNT; ++word) {
-                if (data[word] != ~0ULL) {
-                    return (word * BITS_PER_WORD) + std::countr_one(data[word]);
-                }
-            }
-            return N;
-        };
-
-        const auto word_bits = [&](size_t index, u64 word) {
-            const int empty_bits = std::countr_zero(word);
-            const int ones_count = std::countr_one(word >> empty_bits);
-            const size_t start_bit = index * BITS_PER_WORD + empty_bits;
-            if (ones_count + empty_bits < BITS_PER_WORD) {
-                return Range{start_bit, start_bit + ones_count};
-            }
-            return Range{start_bit, find_end_bit(index + 1)};
-        };
-
-        const size_t start_word = start / BITS_PER_WORD;
-        const size_t start_bit = start % BITS_PER_WORD;
-        const u64 masked_first = data[start_word] & (~((1ULL << start_bit) - 1));
-        if (masked_first) {
-            return word_bits(start_word, masked_first);
-        }
-
-        size_t word = start_word + 1;
-#ifdef BIT_ARRAY_USE_AVX
-        for (; word + WORDS_PER_AVX <= WORD_COUNT; word += WORDS_PER_AVX) {
-            const __m256i current =
-                _mm256_loadu_si256(reinterpret_cast<const __m256i*>(&data[word]));
-            if (!_mm256_testz_si256(current, current)) {
-                break;
-            }
-        }
-#endif
-        for (; word < WORD_COUNT; ++word) {
-            if (data[word] != 0) {
-                return word_bits(word, data[word]);
-            }
-        }
-        return {N, N};
-    }
-
-    inline constexpr Range FirstRange() const {
-        return FirstRangeFrom(0);
-    }
-
-    Range LastRangeFrom(size_t end) const {
-        if (end == 0) {
-            return {0, 0};
-        }
-        if (end > N) {
-            end = N;
-        }
-        const auto find_start_bit = [&](size_t word) {
-#ifdef BIT_ARRAY_USE_AVX
-            const __m256i all_zero = _mm256_setzero_si256();
-            for (; word >= WORDS_PER_AVX; word -= WORDS_PER_AVX) {
-                const __m256i current = _mm256_loadu_si256(
-                    reinterpret_cast<const __m256i*>(&data[word - WORDS_PER_AVX]));
-                const __m256i cmp = _mm256_cmpeq_epi64(current, all_zero);
-                if (_mm256_movemask_epi8(cmp) != 0xFFFFFFFF) {
-                    break;
-                }
-            }
-#endif
-            for (; word > 0; --word) {
-                if (data[word - 1] != ~0ULL) {
-                    return word * BITS_PER_WORD - std::countl_one(data[word - 1]);
-                }
-            }
-            return size_t(0);
-        };
-        const auto word_bits = [&](size_t index, u64 word) {
-            const int empty_bits = std::countl_zero(word);
-            const int ones_count = std::countl_one(word << empty_bits);
-            const size_t end_bit = index * BITS_PER_WORD - empty_bits;
-            if (empty_bits + ones_count < BITS_PER_WORD) {
-                return Range{end_bit - ones_count, end_bit};
-            }
-            return Range{find_start_bit(index - 1), end_bit};
-        };
-        const size_t end_word = ((end - 1) / BITS_PER_WORD) + 1;
-        const size_t end_bit = (end - 1) % BITS_PER_WORD;
-        u64 masked_last = data[end_word - 1];
-        if (end_bit < BITS_PER_WORD - 1) {
-            masked_last &= (1ULL << (end_bit + 1)) - 1;
-        }
-        if (masked_last) {
-            return word_bits(end_word, masked_last);
-        }
-        size_t word = end_word - 1;
-#ifdef BIT_ARRAY_USE_AVX
-        for (; word >= WORDS_PER_AVX; word -= WORDS_PER_AVX) {
-            const __m256i current =
-                _mm256_loadu_si256(reinterpret_cast<const __m256i*>(&data[word - WORDS_PER_AVX]));
-            if (!_mm256_testz_si256(current, current)) {
-                break;
-            }
-        }
-#endif
-        for (; word > 0; --word) {
-            if (data[word - 1] != 0) {
-                return word_bits(word, data[word - 1]);
-            }
-        }
-        return {0, 0};
-    }
-
-    inline constexpr Range LastRange() const {
-        return LastRangeFrom(N);
-    }
-
-    inline constexpr size_t Size() const {
-        return N;
-    }
-
-    inline constexpr BitArray& operator|=(const BitArray& other) {
-        for (size_t i = 0; i < WORD_COUNT; ++i) {
-            data[i] |= other.data[i];
-        }
-        return *this;
-    }
-
-    inline constexpr BitArray& operator&=(const BitArray& other) {
-        for (size_t i = 0; i < WORD_COUNT; ++i) {
-            data[i] &= other.data[i];
-        }
-        return *this;
-    }
-
-    inline constexpr BitArray& operator^=(const BitArray& other) {
-        for (size_t i = 0; i < WORD_COUNT; ++i) {
-            data[i] ^= other.data[i];
-        }
-        return *this;
-    }
-
-    inline constexpr BitArray operator|(const BitArray& other) const {
-        BitArray result = *this;
-        result |= other;
-        return result;
-    }
-
-    inline constexpr BitArray operator&(const BitArray& other) const {
-        BitArray result = *this;
-        result &= other;
-        return result;
-    }
-
-    inline constexpr BitArray operator^(const BitArray& other) const {
-        BitArray result = *this;
-        result ^= other;
-        return result;
-    }
-
-    inline constexpr BitArray operator~() const {
-        BitArray result = *this;
-        for (size_t i = 0; i < WORD_COUNT; ++i) {
-            result.data[i] = ~result.data[i];
-        }
-        return result;
-    }
-
-    inline constexpr bool operator==(const BitArray& other) const {
-        u64 result = 0;
-        for (size_t i = 0; i < WORD_COUNT; ++i) {
-            result |= data[i] ^ other.data[i];
-        }
-        return result == 0;
-    }
-
-    inline constexpr bool operator!=(const BitArray& other) const {
-        return !(*this == other);
-    }
-
-private:
-    std::array<u64, WORD_COUNT> data{};
-};
-
-} // namespace Common

src/common/config.cpp

@@ -31,56 +31,35 @@ std::filesystem::path find_fs_path_or(const basic_value<TC>& v, const K& ky,
 
 namespace Config {
 
-// General
-static int volumeSlider = 100;
 static bool isNeo = false;
 static bool isDevKit = false;
-static bool isPSNSignedIn = false;
+static bool playBGM = false;
 static bool isTrophyPopupDisabled = false;
-static double trophyNotificationDuration = 6.0;
+static int BGMvolume = 50;
 static bool enableDiscordRPC = false;
-static std::string logFilter = "";
+static u32 screenWidth = 1280;
+static u32 screenHeight = 720;
+static s32 gpuId = -1; // Vulkan physical device index. Set to negative for auto select
+static std::string logFilter;
 static std::string logType = "sync";
 static std::string userName = "shadPS4";
-static std::string chooseHomeTab = "General";
+static std::string updateChannel;
-static bool isShowSplash = false;
+static std::string chooseHomeTab;
-static std::string isSideTrophy = "right";
+static std::string backButtonBehavior = "left";
-static bool compatibilityData = false;
-static bool checkCompatibilityOnStartup = false;
-static bool isConnectedToNetwork = false;
-
-// Input
-static int cursorState = HideCursorState::Idle;
-static int cursorHideTimeout = 5; // 5 seconds (default)
 static bool useSpecialPad = false;
 static int specialPadClass = 1;
 static bool isMotionControlsEnabled = true;
-static bool useUnifiedInputConfig = true;
+static bool isDebugDump = false;
-static std::string micDevice = "Default Device";
+static bool isShaderDebug = false;
-
+static bool isShowSplash = false;
-// These two entries aren't stored in the config
+static bool isAutoUpdate = false;
-static bool overrideControllerColor = false;
+static bool isAlwaysShowChangelog = false;
-static int controllerCustomColorRGB[3] = {0, 0, 255};
+static std::string isSideTrophy = "right";
-
-// GPU
-static u32 windowWidth = 1280;
-static u32 windowHeight = 720;
-static u32 internalScreenWidth = 1280;
-static u32 internalScreenHeight = 720;
 static bool isNullGpu = false;
 static bool shouldCopyGPUBuffers = false;
-static bool readbacksEnabled = false;
-static bool readbackLinearImagesEnabled = false;
-static bool directMemoryAccessEnabled = false;
 static bool shouldDumpShaders = false;
-static bool shouldPatchShaders = false;
+static bool shouldPatchShaders = true;
 static u32 vblankDivider = 1;
-static bool isFullscreen = false;
-static std::string fullscreenMode = "Windowed";
-static bool isHDRAllowed = false;
-
-// Vulkan
-static s32 gpuId = -1;
 static bool vkValidation = false;
 static bool vkValidationSync = false;
 static bool vkValidationGpu = false;
@@ -88,32 +67,49 @@ static bool vkCrashDiagnostic = false;
 static bool vkHostMarkers = false;
 static bool vkGuestMarkers = false;
 static bool rdocEnable = false;
-
-// Debug
-static bool isDebugDump = false;
-static bool isShaderDebug = false;
-static bool isSeparateLogFilesEnabled = false;
 static bool isFpsColor = true;
+static bool isSeparateLogFilesEnabled = false;
+static s16 cursorState = HideCursorState::Idle;
+static int cursorHideTimeout = 5; // 5 seconds (default)
+static double trophyNotificationDuration = 6.0;
+static bool useUnifiedInputConfig = true;
+static bool overrideControllerColor = false;
+static int controllerCustomColorRGB[3] = {0, 0, 255};
+static bool compatibilityData = false;
+static bool checkCompatibilityOnStartup = false;
+static std::string trophyKey;
 
-// GUI
+// Gui
 static bool load_game_size = true;
 static std::vector<GameInstallDir> settings_install_dirs = {};
 std::vector<bool> install_dirs_enabled = {};
 std::filesystem::path settings_addon_install_dir = {};
 std::filesystem::path save_data_path = {};
+u32 main_window_geometry_x = 400;
+u32 main_window_geometry_y = 400;
+u32 main_window_geometry_w = 1280;
+u32 main_window_geometry_h = 720;
+u32 mw_themes = 0;
+u32 m_icon_size = 36;
+u32 m_icon_size_grid = 69;
+u32 m_slider_pos = 0;
+u32 m_slider_pos_grid = 0;
+u32 m_table_mode = 0;
+u32 m_window_size_W = 1280;
+u32 m_window_size_H = 720;
+std::vector<std::string> m_elf_viewer;
+std::vector<std::string> m_recent_files;
+std::string emulator_language = "en_US";
+static int backgroundImageOpacity = 50;
+static bool showBackgroundImage = true;
+static bool isFullscreen = false;
+static std::string fullscreenMode = "Windowed";
+static bool isHDRAllowed = false;
+static bool showLabelsUnderIcons = true;
 
-// Settings
+// Language
 u32 m_language = 1; // english
 
-// Keys
-static std::string trophyKey = "";
-
-// Config version, used to determine if a user's config file is outdated.
-static std::string config_version = Common::g_scm_rev;
-
-int getVolumeSlider() {
-    return volumeSlider;
-}
 bool allowHDR() {
     return isHDRAllowed;
 }
@@ -158,15 +154,11 @@ bool GetLoadGameSizeEnabled() {
 
 std::filesystem::path GetSaveDataPath() {
     if (save_data_path.empty()) {
-        return Common::FS::GetUserPath(Common::FS::PathType::UserDir) / "savedata";
+        return Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir);
     }
     return save_data_path;
 }
 
-void setVolumeSlider(int volumeValue) {
-    volumeSlider = volumeValue;
-}
-
 void setLoadGameSizeEnabled(bool enable) {
     load_game_size = enable;
 }
@@ -183,6 +175,14 @@ bool getIsFullscreen() {
     return isFullscreen;
 }
 
+bool getShowLabelsUnderIcons() {
+    return showLabelsUnderIcons;
+}
+
+bool setShowLabelsUnderIcons() {
+    return false;
+}
+
 std::string getFullscreenMode() {
     return fullscreenMode;
 }
@@ -191,6 +191,14 @@ bool getisTrophyPopupDisabled() {
     return isTrophyPopupDisabled;
 }
 
+bool getPlayBGM() {
+    return playBGM;
+}
+
+int getBGMvolume() {
+    return BGMvolume;
+}
+
 bool getEnableDiscordRPC() {
     return enableDiscordRPC;
 }
@@ -203,28 +211,16 @@ int getCursorHideTimeout() {
     return cursorHideTimeout;
 }
 
-std::string getMicDevice() {
-    return micDevice;
-}
-
 double getTrophyNotificationDuration() {
     return trophyNotificationDuration;
 }
 
-u32 getWindowWidth() {
+u32 getScreenWidth() {
-    return windowWidth;
+    return screenWidth;
 }
 
-u32 getWindowHeight() {
+u32 getScreenHeight() {
-    return windowHeight;
+    return screenHeight;
-}
-
-u32 getInternalScreenWidth() {
-    return internalScreenHeight;
-}
-
-u32 getInternalScreenHeight() {
-    return internalScreenHeight;
 }
 
 s32 getGpuId() {
@@ -243,10 +239,18 @@ std::string getUserName() {
     return userName;
 }
 
+std::string getUpdateChannel() {
+    return updateChannel;
+}
+
 std::string getChooseHomeTab() {
     return chooseHomeTab;
 }
 
+std::string getBackButtonBehavior() {
+    return backButtonBehavior;
+}
+
 bool getUseSpecialPad() {
     return useSpecialPad;
 }
@@ -271,6 +275,14 @@ bool showSplash() {
     return isShowSplash;
 }
 
+bool autoUpdate() {
+    return isAutoUpdate;
+}
+
+bool alwaysShowChangelog() {
+    return isAlwaysShowChangelog;
+}
+
 std::string sideTrophy() {
     return isSideTrophy;
 }
@@ -283,18 +295,6 @@ bool copyGPUCmdBuffers() {
     return shouldCopyGPUBuffers;
 }
 
-bool readbacks() {
-    return readbacksEnabled;
-}
-
-bool readbackLinearImages() {
-    return readbackLinearImagesEnabled;
-}
-
-bool directMemoryAccess() {
-    return directMemoryAccessEnabled;
-}
-
 bool dumpShaders() {
     return shouldDumpShaders;
 }
@@ -359,28 +359,16 @@ bool getCheckCompatibilityOnStartup() {
     return checkCompatibilityOnStartup;
 }
 
-bool getIsConnectedToNetwork() {
-    return isConnectedToNetwork;
-}
-
 void setGpuId(s32 selectedGpuId) {
     gpuId = selectedGpuId;
 }
 
-void setWindowWidth(u32 width) {
+void setScreenWidth(u32 width) {
-    windowWidth = width;
+    screenWidth = width;
 }
 
-void setWindowHeight(u32 height) {
+void setScreenHeight(u32 height) {
-    windowHeight = height;
+    screenHeight = height;
-}
-
-void setInternalScreenWidth(u32 width) {
-    internalScreenWidth = width;
-}
-
-void setInternalScreenHeight(u32 height) {
-    internalScreenHeight = height;
 }
 
 void setDebugDump(bool enable) {
@@ -395,6 +383,14 @@ void setShowSplash(bool enable) {
     isShowSplash = enable;
 }
 
+void setAutoUpdate(bool enable) {
+    isAutoUpdate = enable;
+}
+
+void setAlwaysShowChangelog(bool enable) {
+    isAlwaysShowChangelog = enable;
+}
+
 void setSideTrophy(std::string side) {
     isSideTrophy = side;
 }
@@ -411,18 +407,6 @@ void setCopyGPUCmdBuffers(bool enable) {
     shouldCopyGPUBuffers = enable;
 }
 
-void setReadbacks(bool enable) {
-    readbacksEnabled = enable;
-}
-
-void setReadbackLinearImages(bool enable) {
-    readbackLinearImagesEnabled = enable;
-}
-
-void setDirectMemoryAccess(bool enable) {
-    directMemoryAccessEnabled = enable;
-}
-
 void setDumpShaders(bool enable) {
     shouldDumpShaders = enable;
 }
@@ -446,6 +430,9 @@ void setVblankDiv(u32 value) {
 void setIsFullscreen(bool enable) {
     isFullscreen = enable;
 }
+static void setShowLabelsUnderIcons(bool enable) {
+    showLabelsUnderIcons = enable;
+}
 
 void setFullscreenMode(std::string mode) {
     fullscreenMode = mode;
@@ -455,6 +442,14 @@ void setisTrophyPopupDisabled(bool disable) {
     isTrophyPopupDisabled = disable;
 }
 
+void setPlayBGM(bool enable) {
+    playBGM = enable;
+}
+
+void setBGMvolume(int volume) {
+    BGMvolume = volume;
+}
+
 void setEnableDiscordRPC(bool enable) {
     enableDiscordRPC = enable;
 }
@@ -466,11 +461,6 @@ void setCursorState(s16 newCursorState) {
 void setCursorHideTimeout(int newcursorHideTimeout) {
     cursorHideTimeout = newcursorHideTimeout;
 }
-
-void setMicDevice(std::string device) {
-    micDevice = device;
-}
-
 void setTrophyNotificationDuration(double newTrophyNotificationDuration) {
     trophyNotificationDuration = newTrophyNotificationDuration;
 }
@@ -499,10 +489,17 @@ void setUserName(const std::string& type) {
     userName = type;
 }
 
+void setUpdateChannel(const std::string& type) {
+    updateChannel = type;
+}
 void setChooseHomeTab(const std::string& type) {
     chooseHomeTab = type;
 }
 
+void setBackButtonBehavior(const std::string& type) {
+    backButtonBehavior = type;
+}
+
 void setUseSpecialPad(bool use) {
     useSpecialPad = use;
 }
@@ -523,6 +520,13 @@ void setCheckCompatibilityOnStartup(bool use) {
     checkCompatibilityOnStartup = use;
 }
 
+void setMainWindowGeometry(u32 x, u32 y, u32 w, u32 h) {
+    main_window_geometry_x = x;
+    main_window_geometry_y = y;
+    main_window_geometry_w = w;
+    main_window_geometry_h = h;
+}
+
 bool addGameInstallDir(const std::filesystem::path& dir, bool enabled) {
     for (const auto& install_dir : settings_install_dirs) {
         if (install_dir.path == dir) {
@@ -555,6 +559,52 @@ void setAddonInstallDir(const std::filesystem::path& dir) {
     settings_addon_install_dir = dir;
 }
 
+void setMainWindowTheme(u32 theme) {
+    mw_themes = theme;
+}
+
+void setIconSize(u32 size) {
+    m_icon_size = size;
+}
+
+void setIconSizeGrid(u32 size) {
+    m_icon_size_grid = size;
+}
+
+void setSliderPosition(u32 pos) {
+    m_slider_pos = pos;
+}
+
+void setSliderPositionGrid(u32 pos) {
+    m_slider_pos_grid = pos;
+}
+
+void setTableMode(u32 mode) {
+    m_table_mode = mode;
+}
+
+void setMainWindowWidth(u32 width) {
+    m_window_size_W = width;
+}
+
+void setMainWindowHeight(u32 height) {
+    m_window_size_H = height;
+}
+
+void setElfViewer(const std::vector<std::string>& elfList) {
+    m_elf_viewer.resize(elfList.size());
+    m_elf_viewer = elfList;
+}
+
+void setRecentFiles(const std::vector<std::string>& recentFiles) {
+    m_recent_files.resize(recentFiles.size());
+    m_recent_files = recentFiles;
+}
+
+void setEmulatorLanguage(std::string language) {
+    emulator_language = language;
+}
+
 void setGameInstallDirs(const std::vector<std::filesystem::path>& dirs_config) {
     settings_install_dirs.clear();
     for (const auto& dir : dirs_config) {
@@ -570,6 +620,22 @@ void setSaveDataPath(const std::filesystem::path& path) {
     save_data_path = path;
 }
 
+u32 getMainWindowGeometryX() {
+    return main_window_geometry_x;
+}
+
+u32 getMainWindowGeometryY() {
+    return main_window_geometry_y;
+}
+
+u32 getMainWindowGeometryW() {
+    return main_window_geometry_w;
+}
+
+u32 getMainWindowGeometryH() {
+    return main_window_geometry_h;
+}
+
 const std::vector<std::filesystem::path> getGameInstallDirs() {
     std::vector<std::filesystem::path> enabled_dirs;
     for (const auto& dir : settings_install_dirs) {
@@ -596,6 +662,50 @@ std::filesystem::path getAddonInstallDir() {
     return settings_addon_install_dir;
 }
 
+u32 getMainWindowTheme() {
+    return mw_themes;
+}
+
+u32 getIconSize() {
+    return m_icon_size;
+}
+
+u32 getIconSizeGrid() {
+    return m_icon_size_grid;
+}
+
+u32 getSliderPosition() {
+    return m_slider_pos;
+}
+
+u32 getSliderPositionGrid() {
+    return m_slider_pos_grid;
+}
+
+u32 getTableMode() {
+    return m_table_mode;
+}
+
+u32 getMainWindowWidth() {
+    return m_window_size_W;
+}
+
+u32 getMainWindowHeight() {
+    return m_window_size_H;
+}
+
+std::vector<std::string> getElfViewer() {
+    return m_elf_viewer;
+}
+
+std::vector<std::string> getRecentFiles() {
+    return m_recent_files;
+}
+
+std::string getEmulatorLanguage() {
+    return emulator_language;
+}
+
 u32 GetLanguage() {
     return m_language;
 }
@@ -604,12 +714,20 @@ bool getSeparateLogFilesEnabled() {
     return isSeparateLogFilesEnabled;
 }
 
-bool getPSNSignedIn() {
+int getBackgroundImageOpacity() {
-    return isPSNSignedIn;
+    return backgroundImageOpacity;
 }
 
-void setPSNSignedIn(bool sign) {
+void setBackgroundImageOpacity(int opacity) {
-    isPSNSignedIn = sign;
+    backgroundImageOpacity = std::clamp(opacity, 0, 100);
+}
+
+bool getShowBackgroundImage() {
+    return showBackgroundImage;
+}
+
+void setShowBackgroundImage(bool show) {
+    showBackgroundImage = show;
 }
 
 void load(const std::filesystem::path& path) {
@@ -631,99 +749,95 @@ void load(const std::filesystem::path& path) {
         fmt::print("Got exception trying to load config file. Exception: {}\n", ex.what());
         return;
     }
-
     if (data.contains("General")) {
         const toml::value& general = data.at("General");
 
-        volumeSlider = toml::find_or<int>(general, "volumeSlider", volumeSlider);
+        isNeo = toml::find_or<bool>(general, "isPS4Pro", false);
-        isNeo = toml::find_or<bool>(general, "isPS4Pro", isNeo);
+        isDevKit = toml::find_or<bool>(general, "isDevKit", false);
-        isDevKit = toml::find_or<bool>(general, "isDevKit", isDevKit);
+        playBGM = toml::find_or<bool>(general, "playBGM", false);
-        isPSNSignedIn = toml::find_or<bool>(general, "isPSNSignedIn", isPSNSignedIn);
+        isTrophyPopupDisabled = toml::find_or<bool>(general, "isTrophyPopupDisabled", false);
-        isTrophyPopupDisabled =
+        trophyNotificationDuration =
-            toml::find_or<bool>(general, "isTrophyPopupDisabled", isTrophyPopupDisabled);
+            toml::find_or<double>(general, "trophyNotificationDuration", 5.0);
-        trophyNotificationDuration = toml::find_or<double>(general, "trophyNotificationDuration",
+        BGMvolume = toml::find_or<int>(general, "BGMvolume", 50);
-                                                           trophyNotificationDuration);
+        enableDiscordRPC = toml::find_or<bool>(general, "enableDiscordRPC", true);
-        enableDiscordRPC = toml::find_or<bool>(general, "enableDiscordRPC", enableDiscordRPC);
+        logFilter = toml::find_or<std::string>(general, "logFilter", "");
-        logFilter = toml::find_or<std::string>(general, "logFilter", logFilter);
+        logType = toml::find_or<std::string>(general, "logType", "sync");
-        logType = toml::find_or<std::string>(general, "logType", logType);
+        userName = toml::find_or<std::string>(general, "userName", "shadPS4");
-        userName = toml::find_or<std::string>(general, "userName", userName);
+        if (Common::g_is_release) {
-        isShowSplash = toml::find_or<bool>(general, "showSplash", isShowSplash);
+            updateChannel = toml::find_or<std::string>(general, "updateChannel", "Release");
-        isSideTrophy = toml::find_or<std::string>(general, "sideTrophy", isSideTrophy);
+        } else {
-        compatibilityData = toml::find_or<bool>(general, "compatibilityEnabled", compatibilityData);
+            updateChannel = toml::find_or<std::string>(general, "updateChannel", "Nightly");
-        checkCompatibilityOnStartup = toml::find_or<bool>(general, "checkCompatibilityOnStartup",
+        }
-                                                          checkCompatibilityOnStartup);
+        isShowSplash = toml::find_or<bool>(general, "showSplash", true);
-
+        isAutoUpdate = toml::find_or<bool>(general, "autoUpdate", false);
-        isConnectedToNetwork =
+        isAlwaysShowChangelog = toml::find_or<bool>(general, "alwaysShowChangelog", false);
-            toml::find_or<bool>(general, "isConnectedToNetwork", isConnectedToNetwork);
+        isSideTrophy = toml::find_or<std::string>(general, "sideTrophy", "right");
-        chooseHomeTab = toml::find_or<std::string>(general, "chooseHomeTab", chooseHomeTab);
+        compatibilityData = toml::find_or<bool>(general, "compatibilityEnabled", false);
+        checkCompatibilityOnStartup =
+            toml::find_or<bool>(general, "checkCompatibilityOnStartup", false);
+        chooseHomeTab = toml::find_or<std::string>(general, "chooseHomeTab", "Release");
     }
 
     if (data.contains("Input")) {
         const toml::value& input = data.at("Input");
 
-        cursorState = toml::find_or<int>(input, "cursorState", cursorState);
+        cursorState = toml::find_or<int>(input, "cursorState", HideCursorState::Idle);
-        cursorHideTimeout = toml::find_or<int>(input, "cursorHideTimeout", cursorHideTimeout);
+        cursorHideTimeout = toml::find_or<int>(input, "cursorHideTimeout", 5);
-        useSpecialPad = toml::find_or<bool>(input, "useSpecialPad", useSpecialPad);
+        backButtonBehavior = toml::find_or<std::string>(input, "backButtonBehavior", "left");
-        specialPadClass = toml::find_or<int>(input, "specialPadClass", specialPadClass);
+        useSpecialPad = toml::find_or<bool>(input, "useSpecialPad", false);
-        isMotionControlsEnabled =
+        specialPadClass = toml::find_or<int>(input, "specialPadClass", 1);
-            toml::find_or<bool>(input, "isMotionControlsEnabled", isMotionControlsEnabled);
+        isMotionControlsEnabled = toml::find_or<bool>(input, "isMotionControlsEnabled", true);
-        useUnifiedInputConfig =
+        useUnifiedInputConfig = toml::find_or<bool>(input, "useUnifiedInputConfig", true);
-            toml::find_or<bool>(input, "useUnifiedInputConfig", useUnifiedInputConfig);
-        micDevice = toml::find_or<std::string>(input, "micDevice", micDevice);
     }
 
     if (data.contains("GPU")) {
         const toml::value& gpu = data.at("GPU");
 
-        windowWidth = toml::find_or<int>(gpu, "screenWidth", windowWidth);
+        screenWidth = toml::find_or<int>(gpu, "screenWidth", screenWidth);
-        windowHeight = toml::find_or<int>(gpu, "screenHeight", windowHeight);
+        screenHeight = toml::find_or<int>(gpu, "screenHeight", screenHeight);
-        internalScreenWidth = toml::find_or<int>(gpu, "internalScreenWidth", internalScreenWidth);
+        isNullGpu = toml::find_or<bool>(gpu, "nullGpu", false);
-        internalScreenHeight =
+        shouldCopyGPUBuffers = toml::find_or<bool>(gpu, "copyGPUBuffers", false);
-            toml::find_or<int>(gpu, "internalScreenHeight", internalScreenHeight);
+        shouldDumpShaders = toml::find_or<bool>(gpu, "dumpShaders", false);
-        isNullGpu = toml::find_or<bool>(gpu, "nullGpu", isNullGpu);
+        shouldPatchShaders = toml::find_or<bool>(gpu, "patchShaders", true);
-        shouldCopyGPUBuffers = toml::find_or<bool>(gpu, "copyGPUBuffers", shouldCopyGPUBuffers);
+        vblankDivider = toml::find_or<int>(gpu, "vblankDivider", 1);
-        readbacksEnabled = toml::find_or<bool>(gpu, "readbacks", readbacksEnabled);
+        isFullscreen = toml::find_or<bool>(gpu, "Fullscreen", false);
-        readbackLinearImagesEnabled =
+        fullscreenMode = toml::find_or<std::string>(gpu, "FullscreenMode", "Windowed");
-            toml::find_or<bool>(gpu, "readbackLinearImages", readbackLinearImagesEnabled);
+        isHDRAllowed = toml::find_or<bool>(gpu, "allowHDR", false);
-        directMemoryAccessEnabled =
-            toml::find_or<bool>(gpu, "directMemoryAccess", directMemoryAccessEnabled);
-        shouldDumpShaders = toml::find_or<bool>(gpu, "dumpShaders", shouldDumpShaders);
-        shouldPatchShaders = toml::find_or<bool>(gpu, "patchShaders", shouldPatchShaders);
-        vblankDivider = toml::find_or<int>(gpu, "vblankDivider", vblankDivider);
-        isFullscreen = toml::find_or<bool>(gpu, "Fullscreen", isFullscreen);
-        fullscreenMode = toml::find_or<std::string>(gpu, "FullscreenMode", fullscreenMode);
-        isHDRAllowed = toml::find_or<bool>(gpu, "allowHDR", isHDRAllowed);
     }
 
     if (data.contains("Vulkan")) {
         const toml::value& vk = data.at("Vulkan");
 
-        gpuId = toml::find_or<int>(vk, "gpuId", gpuId);
+        gpuId = toml::find_or<int>(vk, "gpuId", -1);
-        vkValidation = toml::find_or<bool>(vk, "validation", vkValidation);
+        vkValidation = toml::find_or<bool>(vk, "validation", false);
-        vkValidationSync = toml::find_or<bool>(vk, "validation_sync", vkValidationSync);
+        vkValidationSync = toml::find_or<bool>(vk, "validation_sync", false);
-        vkValidationGpu = toml::find_or<bool>(vk, "validation_gpu", vkValidationGpu);
+        vkValidationGpu = toml::find_or<bool>(vk, "validation_gpu", true);
-        vkCrashDiagnostic = toml::find_or<bool>(vk, "crashDiagnostic", vkCrashDiagnostic);
+        vkCrashDiagnostic = toml::find_or<bool>(vk, "crashDiagnostic", false);
-        vkHostMarkers = toml::find_or<bool>(vk, "hostMarkers", vkHostMarkers);
+        vkHostMarkers = toml::find_or<bool>(vk, "hostMarkers", false);
-        vkGuestMarkers = toml::find_or<bool>(vk, "guestMarkers", vkGuestMarkers);
+        vkGuestMarkers = toml::find_or<bool>(vk, "guestMarkers", false);
-        rdocEnable = toml::find_or<bool>(vk, "rdocEnable", rdocEnable);
+        rdocEnable = toml::find_or<bool>(vk, "rdocEnable", false);
     }
 
-    std::string current_version = {};
     if (data.contains("Debug")) {
         const toml::value& debug = data.at("Debug");
 
-        isDebugDump = toml::find_or<bool>(debug, "DebugDump", isDebugDump);
+        isDebugDump = toml::find_or<bool>(debug, "DebugDump", false);
-        isSeparateLogFilesEnabled =
+        isSeparateLogFilesEnabled = toml::find_or<bool>(debug, "isSeparateLogFilesEnabled", false);
-            toml::find_or<bool>(debug, "isSeparateLogFilesEnabled", isSeparateLogFilesEnabled);
+        isShaderDebug = toml::find_or<bool>(debug, "CollectShader", false);
-        isShaderDebug = toml::find_or<bool>(debug, "CollectShader", isShaderDebug);
+        isFpsColor = toml::find_or<bool>(debug, "FPSColor", true);
-        isFpsColor = toml::find_or<bool>(debug, "FPSColor", isFpsColor);
-        current_version = toml::find_or<std::string>(debug, "ConfigVersion", current_version);
     }
 
     if (data.contains("GUI")) {
         const toml::value& gui = data.at("GUI");
 
-        load_game_size = toml::find_or<bool>(gui, "loadGameSizeEnabled", load_game_size);
+        load_game_size = toml::find_or<bool>(gui, "loadGameSizeEnabled", true);
+        m_icon_size = toml::find_or<int>(gui, "iconSize", 0);
+        m_icon_size_grid = toml::find_or<int>(gui, "iconSizeGrid", 0);
+        m_slider_pos = toml::find_or<int>(gui, "sliderPos", 0);
+        m_slider_pos_grid = toml::find_or<int>(gui, "sliderPosGrid", 0);
+        mw_themes = toml::find_or<int>(gui, "theme", 0);
+        m_window_size_W = toml::find_or<int>(gui, "mw_width", 0);
+        m_window_size_H = toml::find_or<int>(gui, "mw_height", 0);
 
         const auto install_dir_array =
             toml::find_or<std::vector<std::u8string>>(gui, "installDirs", {});
@@ -745,25 +859,41 @@ void load(const std::filesystem::path& path) {
                 {std::filesystem::path{install_dir_array[i]}, install_dirs_enabled[i]});
         }
 
-        save_data_path = toml::find_fs_path_or(gui, "saveDataPath", save_data_path);
+        save_data_path = toml::find_fs_path_or(gui, "saveDataPath", {});
 
-        settings_addon_install_dir =
+        settings_addon_install_dir = toml::find_fs_path_or(gui, "addonInstallDir", {});
-            toml::find_fs_path_or(gui, "addonInstallDir", settings_addon_install_dir);
+        main_window_geometry_x = toml::find_or<int>(gui, "geometry_x", 0);
+        main_window_geometry_y = toml::find_or<int>(gui, "geometry_y", 0);
+        main_window_geometry_w = toml::find_or<int>(gui, "geometry_w", 0);
+        main_window_geometry_h = toml::find_or<int>(gui, "geometry_h", 0);
+        m_elf_viewer = toml::find_or<std::vector<std::string>>(gui, "elfDirs", {});
+        m_recent_files = toml::find_or<std::vector<std::string>>(gui, "recentFiles", {});
+        m_table_mode = toml::find_or<int>(gui, "gameTableMode", 0);
+        emulator_language = toml::find_or<std::string>(gui, "emulatorLanguage", "en_US");
+        backgroundImageOpacity = toml::find_or<int>(gui, "backgroundImageOpacity", 50);
+        showBackgroundImage = toml::find_or<bool>(gui, "showBackgroundImage", true);
     }
 
     if (data.contains("Settings")) {
         const toml::value& settings = data.at("Settings");
-        m_language = toml::find_or<int>(settings, "consoleLanguage", m_language);
+
+        m_language = toml::find_or<int>(settings, "consoleLanguage", 1);
     }
 
     if (data.contains("Keys")) {
         const toml::value& keys = data.at("Keys");
-        trophyKey = toml::find_or<std::string>(keys, "TrophyKey", trophyKey);
+        trophyKey = toml::find_or<std::string>(keys, "TrophyKey", "");
     }
 
-    // Run save after loading to generate any missing fields with default values.
+    // Check if the loaded language is in the allowed list
-    if (config_version != current_version) {
+    const std::vector<std::string> allowed_languages = {
-        fmt::print("Outdated config detected, updating config file.\n");
+        "ar_SA", "da_DK", "de_DE", "el_GR", "en_US", "es_ES", "fa_IR", "fi_FI", "fr_FR", "hu_HU",
+        "id_ID", "it_IT", "ja_JP", "ko_KR", "lt_LT", "nb_NO", "nl_NL", "pl_PL", "pt_BR", "pt_PT",
+        "ro_RO", "ru_RU", "sq_AL", "sv_SE", "tr_TR", "uk_UA", "vi_VN", "zh_CN", "zh_TW"};
+
+    if (std::find(allowed_languages.begin(), allowed_languages.end(), emulator_language) ==
+        allowed_languages.end()) {
+        emulator_language = "en_US"; // Default to en_US if not in the list
         save(path);
     }
 }
@@ -821,38 +951,35 @@ void save(const std::filesystem::path& path) {
         fmt::print("Saving new configuration file {}\n", fmt::UTF(path.u8string()));
     }
 
-    data["General"]["volumeSlider"] = volumeSlider;
     data["General"]["isPS4Pro"] = isNeo;
     data["General"]["isDevKit"] = isDevKit;
-    data["General"]["isPSNSignedIn"] = isPSNSignedIn;
     data["General"]["isTrophyPopupDisabled"] = isTrophyPopupDisabled;
     data["General"]["trophyNotificationDuration"] = trophyNotificationDuration;
+    data["General"]["playBGM"] = playBGM;
+    data["General"]["BGMvolume"] = BGMvolume;
     data["General"]["enableDiscordRPC"] = enableDiscordRPC;
     data["General"]["logFilter"] = logFilter;
     data["General"]["logType"] = logType;
     data["General"]["userName"] = userName;
+    data["General"]["updateChannel"] = updateChannel;
     data["General"]["chooseHomeTab"] = chooseHomeTab;
     data["General"]["showSplash"] = isShowSplash;
+    data["General"]["autoUpdate"] = isAutoUpdate;
+    data["General"]["alwaysShowChangelog"] = isAlwaysShowChangelog;
     data["General"]["sideTrophy"] = isSideTrophy;
     data["General"]["compatibilityEnabled"] = compatibilityData;
     data["General"]["checkCompatibilityOnStartup"] = checkCompatibilityOnStartup;
-    data["General"]["isConnectedToNetwork"] = isConnectedToNetwork;
     data["Input"]["cursorState"] = cursorState;
     data["Input"]["cursorHideTimeout"] = cursorHideTimeout;
+    data["Input"]["backButtonBehavior"] = backButtonBehavior;
     data["Input"]["useSpecialPad"] = useSpecialPad;
     data["Input"]["specialPadClass"] = specialPadClass;
     data["Input"]["isMotionControlsEnabled"] = isMotionControlsEnabled;
     data["Input"]["useUnifiedInputConfig"] = useUnifiedInputConfig;
-    data["Input"]["micDevice"] = micDevice;
+    data["GPU"]["screenWidth"] = screenWidth;
-    data["GPU"]["screenWidth"] = windowWidth;
+    data["GPU"]["screenHeight"] = screenHeight;
-    data["GPU"]["screenHeight"] = windowHeight;
-    data["GPU"]["internalScreenWidth"] = internalScreenWidth;
-    data["GPU"]["internalScreenHeight"] = internalScreenHeight;
     data["GPU"]["nullGpu"] = isNullGpu;
     data["GPU"]["copyGPUBuffers"] = shouldCopyGPUBuffers;
-    data["GPU"]["readbacks"] = readbacksEnabled;
-    data["GPU"]["readbackLinearImages"] = readbackLinearImagesEnabled;
-    data["GPU"]["directMemoryAccess"] = directMemoryAccessEnabled;
     data["GPU"]["dumpShaders"] = shouldDumpShaders;
     data["GPU"]["patchShaders"] = shouldPatchShaders;
     data["GPU"]["vblankDivider"] = vblankDivider;
@@ -871,7 +998,6 @@ void save(const std::filesystem::path& path) {
     data["Debug"]["CollectShader"] = isShaderDebug;
     data["Debug"]["isSeparateLogFilesEnabled"] = isSeparateLogFilesEnabled;
     data["Debug"]["FPSColor"] = isFpsColor;
-    data["Debug"]["ConfigVersion"] = config_version;
     data["Keys"]["TrophyKey"] = trophyKey;
 
     std::vector<std::string> install_dirs;
@@ -908,6 +1034,9 @@ void save(const std::filesystem::path& path) {
 
     data["GUI"]["addonInstallDir"] =
         std::string{fmt::UTF(settings_addon_install_dir.u8string()).data};
+    data["GUI"]["emulatorLanguage"] = emulator_language;
+    data["GUI"]["backgroundImageOpacity"] = backgroundImageOpacity;
+    data["GUI"]["showBackgroundImage"] = showBackgroundImage;
     data["Settings"]["consoleLanguage"] = m_language;
 
     // Sorting of TOML sections
@@ -916,59 +1045,90 @@ void save(const std::filesystem::path& path) {
     std::ofstream file(path, std::ios::binary);
     file << data;
     file.close();
+
+    saveMainWindow(path);
+}
+
+void saveMainWindow(const std::filesystem::path& path) {
+    toml::ordered_value data;
+
+    std::error_code error;
+    if (std::filesystem::exists(path, error)) {
+        try {
+            std::ifstream ifs;
+            ifs.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+            ifs.open(path, std::ios_base::binary);
+            data = toml::parse<toml::ordered_type_config>(
+                ifs, std::string{fmt::UTF(path.filename().u8string()).data});
+        } catch (const std::exception& ex) {
+            fmt::print("Exception trying to parse config file. Exception: {}\n", ex.what());
+            return;
+        }
+    } else {
+        if (error) {
+            fmt::print("Filesystem error: {}\n", error.message());
+        }
+        fmt::print("Saving new configuration file {}\n", fmt::UTF(path.u8string()));
+    }
+
+    data["GUI"]["mw_width"] = m_window_size_W;
+    data["GUI"]["mw_height"] = m_window_size_H;
+    data["GUI"]["theme"] = mw_themes;
+    data["GUI"]["iconSize"] = m_icon_size;
+    data["GUI"]["sliderPos"] = m_slider_pos;
+    data["GUI"]["iconSizeGrid"] = m_icon_size_grid;
+    data["GUI"]["sliderPosGrid"] = m_slider_pos_grid;
+    data["GUI"]["gameTableMode"] = m_table_mode;
+    data["GUI"]["geometry_x"] = main_window_geometry_x;
+    data["GUI"]["geometry_y"] = main_window_geometry_y;
+    data["GUI"]["geometry_w"] = main_window_geometry_w;
+    data["GUI"]["geometry_h"] = main_window_geometry_h;
+    data["GUI"]["elfDirs"] = m_elf_viewer;
+    data["GUI"]["recentFiles"] = m_recent_files;
+
+    // Sorting of TOML sections
+    sortTomlSections(data);
+
+    std::ofstream file(path, std::ios::binary);
+    file << data;
+    file.close();
 }
 
 void setDefaultValues() {
-    // General
+    isHDRAllowed = false;
-    volumeSlider = 100;
     isNeo = false;
     isDevKit = false;
-    isPSNSignedIn = false;
+    isFullscreen = false;
     isTrophyPopupDisabled = false;
-    trophyNotificationDuration = 6.0;
+    playBGM = false;
-    enableDiscordRPC = false;
+    BGMvolume = 50;
+    enableDiscordRPC = true;
+    screenWidth = 1280;
+    screenHeight = 720;
     logFilter = "";
     logType = "sync";
     userName = "shadPS4";
+    if (Common::g_is_release) {
+        updateChannel = "Release";
+    } else {
+        updateChannel = "Nightly";
+    }
     chooseHomeTab = "General";
-    isShowSplash = false;
-    isSideTrophy = "right";
-    compatibilityData = false;
-    checkCompatibilityOnStartup = false;
-    isConnectedToNetwork = false;
-
-    // Input
     cursorState = HideCursorState::Idle;
     cursorHideTimeout = 5;
+    trophyNotificationDuration = 6.0;
+    backButtonBehavior = "left";
     useSpecialPad = false;
     specialPadClass = 1;
-    isMotionControlsEnabled = true;
+    isDebugDump = false;
-    useUnifiedInputConfig = true;
+    isShaderDebug = false;
-    overrideControllerColor = false;
+    isShowSplash = false;
-    controllerCustomColorRGB[0] = 0;
+    isAutoUpdate = false;
-    controllerCustomColorRGB[1] = 0;
+    isAlwaysShowChangelog = false;
-    controllerCustomColorRGB[2] = 255;
+    isSideTrophy = "right";
-    micDevice = "Default Device";
-
-    // GPU
-    windowWidth = 1280;
-    windowHeight = 720;
-    internalScreenWidth = 1280;
-    internalScreenHeight = 720;
     isNullGpu = false;
-    shouldCopyGPUBuffers = false;
-    readbacksEnabled = false;
-    readbackLinearImagesEnabled = false;
-    directMemoryAccessEnabled = false;
     shouldDumpShaders = false;
-    shouldPatchShaders = false;
     vblankDivider = 1;
-    isFullscreen = false;
-    fullscreenMode = "Windowed";
-    isHDRAllowed = false;
-
-    // Vulkan
-    gpuId = -1;
     vkValidation = false;
     vkValidationSync = false;
     vkValidationGpu = false;
@@ -976,18 +1136,13 @@ void setDefaultValues() {
     vkHostMarkers = false;
     vkGuestMarkers = false;
     rdocEnable = false;
-
+    emulator_language = "en_US";
-    // Debug
-    isDebugDump = false;
-    isShaderDebug = false;
-    isSeparateLogFilesEnabled = false;
-    isFpsColor = true;
-
-    // GUI
-    load_game_size = true;
-
-    // Settings
     m_language = 1;
+    gpuId = -1;
+    compatibilityData = false;
+    checkCompatibilityOnStartup = false;
+    backgroundImageOpacity = 50;
+    showBackgroundImage = true;
 }
 
 constexpr std::string_view GetDefaultKeyboardConfig() {
@@ -1013,7 +1168,7 @@ l3 = x
 r3 = m
 
 options = enter
-touchpad_center = space
+touchpad = space
 
 pad_up = up
 pad_down = down
@@ -1045,7 +1200,7 @@ r2 = r2
 r3 = r3
 
 options = options
-touchpad_center = back
+touchpad = back
 
 pad_up = pad_up
 pad_down = pad_down

src/common/config.h

@@ -14,135 +14,172 @@ struct GameInstallDir {
     bool enabled;
 };
 
-enum HideCursorState : int { Never, Idle, Always };
+enum HideCursorState : s16 { Never, Idle, Always };
 
 void load(const std::filesystem::path& path);
 void save(const std::filesystem::path& path);
+void saveMainWindow(const std::filesystem::path& path);
 
-int getVolumeSlider();
-void setVolumeSlider(int volumeValue);
 std::string getTrophyKey();
 void setTrophyKey(std::string key);
-bool getIsFullscreen();
-void setIsFullscreen(bool enable);
-std::string getFullscreenMode();
-void setFullscreenMode(std::string mode);
-u32 getWindowWidth();
-u32 getWindowHeight();
-void setWindowWidth(u32 width);
-void setWindowHeight(u32 height);
-u32 getInternalScreenWidth();
-u32 getInternalScreenHeight();
-void setInternalScreenWidth(u32 width);
-void setInternalScreenHeight(u32 height);
-bool debugDump();
-void setDebugDump(bool enable);
-s32 getGpuId();
-void setGpuId(s32 selectedGpuId);
-bool allowHDR();
-void setAllowHDR(bool enable);
-bool collectShadersForDebug();
-void setCollectShaderForDebug(bool enable);
-bool showSplash();
-void setShowSplash(bool enable);
-std::string sideTrophy();
-void setSideTrophy(std::string side);
-bool nullGpu();
-void setNullGpu(bool enable);
-bool copyGPUCmdBuffers();
-void setCopyGPUCmdBuffers(bool enable);
-bool readbacks();
-void setReadbacks(bool enable);
-bool readbackLinearImages();
-void setReadbackLinearImages(bool enable);
-bool directMemoryAccess();
-void setDirectMemoryAccess(bool enable);
-bool dumpShaders();
-void setDumpShaders(bool enable);
-u32 vblankDiv();
-void setVblankDiv(u32 value);
-bool getisTrophyPopupDisabled();
-void setisTrophyPopupDisabled(bool disable);
-s16 getCursorState();
-void setCursorState(s16 cursorState);
-bool vkValidationEnabled();
-void setVkValidation(bool enable);
-bool vkValidationSyncEnabled();
-void setVkSyncValidation(bool enable);
-bool getVkCrashDiagnosticEnabled();
-void setVkCrashDiagnosticEnabled(bool enable);
-bool getVkHostMarkersEnabled();
-void setVkHostMarkersEnabled(bool enable);
-bool getVkGuestMarkersEnabled();
-void setVkGuestMarkersEnabled(bool enable);
-bool getEnableDiscordRPC();
-void setEnableDiscordRPC(bool enable);
-bool isRdocEnabled();
-void setRdocEnabled(bool enable);
-std::string getLogType();
-void setLogType(const std::string& type);
-std::string getLogFilter();
-void setLogFilter(const std::string& type);
-double getTrophyNotificationDuration();
-void setTrophyNotificationDuration(double newTrophyNotificationDuration);
-int getCursorHideTimeout();
-std::string getMicDevice();
-void setCursorHideTimeout(int newcursorHideTimeout);
-void setMicDevice(std::string device);
-void setSeparateLogFilesEnabled(bool enabled);
-bool getSeparateLogFilesEnabled();
-u32 GetLanguage();
-void setLanguage(u32 language);
-void setUseSpecialPad(bool use);
-bool getUseSpecialPad();
-void setSpecialPadClass(int type);
-int getSpecialPadClass();
-bool getPSNSignedIn();
-void setPSNSignedIn(bool sign); // no ui setting
-bool patchShaders();            // no set
-bool fpsColor();                // no set
-bool isNeoModeConsole();
-void setNeoMode(bool enable);  // no ui setting
-bool isDevKitConsole();        // no set
-bool vkValidationGpuEnabled(); // no set
-bool getIsMotionControlsEnabled();
-void setIsMotionControlsEnabled(bool use);
-
-// TODO
 bool GetLoadGameSizeEnabled();
 std::filesystem::path GetSaveDataPath();
 void setLoadGameSizeEnabled(bool enable);
+bool getIsFullscreen();
+bool getShowLabelsUnderIcons();
+bool setShowLabelsUnderIcons();
+std::string getFullscreenMode();
+bool isNeoModeConsole();
+bool isDevKitConsole();
+bool getPlayBGM();
+int getBGMvolume();
+bool getisTrophyPopupDisabled();
+bool getEnableDiscordRPC();
 bool getCompatibilityEnabled();
 bool getCheckCompatibilityOnStartup();
-bool getIsConnectedToNetwork();
+int getBackgroundImageOpacity();
+bool getShowBackgroundImage();
+
+std::string getLogFilter();
+std::string getLogType();
 std::string getUserName();
+std::string getUpdateChannel();
 std::string getChooseHomeTab();
+
+s16 getCursorState();
+int getCursorHideTimeout();
+double getTrophyNotificationDuration();
+std::string getBackButtonBehavior();
+bool getUseSpecialPad();
+int getSpecialPadClass();
+bool getIsMotionControlsEnabled();
 bool GetUseUnifiedInputConfig();
 void SetUseUnifiedInputConfig(bool use);
 bool GetOverrideControllerColor();
 void SetOverrideControllerColor(bool enable);
 int* GetControllerCustomColor();
 void SetControllerCustomColor(int r, int b, int g);
+
+u32 getScreenWidth();
+u32 getScreenHeight();
+s32 getGpuId();
+bool allowHDR();
+
+bool debugDump();
+bool collectShadersForDebug();
+bool showSplash();
+bool autoUpdate();
+bool alwaysShowChangelog();
+std::string sideTrophy();
+bool nullGpu();
+bool copyGPUCmdBuffers();
+bool dumpShaders();
+bool patchShaders();
+bool isRdocEnabled();
+bool fpsColor();
+u32 vblankDiv();
+
+void setDebugDump(bool enable);
+void setCollectShaderForDebug(bool enable);
+void setShowSplash(bool enable);
+void setAutoUpdate(bool enable);
+void setAlwaysShowChangelog(bool enable);
+void setSideTrophy(std::string side);
+void setNullGpu(bool enable);
+void setAllowHDR(bool enable);
+void setCopyGPUCmdBuffers(bool enable);
+void setDumpShaders(bool enable);
+void setVblankDiv(u32 value);
+void setGpuId(s32 selectedGpuId);
+void setScreenWidth(u32 width);
+void setScreenHeight(u32 height);
+void setIsFullscreen(bool enable);
+void setFullscreenMode(std::string mode);
+void setisTrophyPopupDisabled(bool disable);
+void setPlayBGM(bool enable);
+void setBGMvolume(int volume);
+void setEnableDiscordRPC(bool enable);
+void setLanguage(u32 language);
+void setNeoMode(bool enable);
 void setUserName(const std::string& type);
+void setUpdateChannel(const std::string& type);
 void setChooseHomeTab(const std::string& type);
 void setGameInstallDirs(const std::vector<std::filesystem::path>& dirs_config);
 void setAllGameInstallDirs(const std::vector<GameInstallDir>& dirs_config);
 void setSaveDataPath(const std::filesystem::path& path);
 void setCompatibilityEnabled(bool use);
 void setCheckCompatibilityOnStartup(bool use);
+void setBackgroundImageOpacity(int opacity);
+void setShowBackgroundImage(bool show);
+
+void setCursorState(s16 cursorState);
+void setCursorHideTimeout(int newcursorHideTimeout);
+void setTrophyNotificationDuration(double newTrophyNotificationDuration);
+void setBackButtonBehavior(const std::string& type);
+void setUseSpecialPad(bool use);
+void setSpecialPadClass(int type);
+void setIsMotionControlsEnabled(bool use);
+
+void setLogType(const std::string& type);
+void setLogFilter(const std::string& type);
+void setSeparateLogFilesEnabled(bool enabled);
+bool getSeparateLogFilesEnabled();
+void setVkValidation(bool enable);
+void setVkSyncValidation(bool enable);
+void setRdocEnabled(bool enable);
+
+bool vkValidationEnabled();
+bool vkValidationSyncEnabled();
+bool vkValidationGpuEnabled();
+bool getVkCrashDiagnosticEnabled();
+bool getVkHostMarkersEnabled();
+bool getVkGuestMarkersEnabled();
+void setVkCrashDiagnosticEnabled(bool enable);
+void setVkHostMarkersEnabled(bool enable);
+void setVkGuestMarkersEnabled(bool enable);
+
 // Gui
+void setMainWindowGeometry(u32 x, u32 y, u32 w, u32 h);
 bool addGameInstallDir(const std::filesystem::path& dir, bool enabled = true);
 void removeGameInstallDir(const std::filesystem::path& dir);
 void setGameInstallDirEnabled(const std::filesystem::path& dir, bool enabled);
 void setAddonInstallDir(const std::filesystem::path& dir);
+void setMainWindowTheme(u32 theme);
+void setIconSize(u32 size);
+void setIconSizeGrid(u32 size);
+void setSliderPosition(u32 pos);
+void setSliderPositionGrid(u32 pos);
+void setTableMode(u32 mode);
+void setMainWindowWidth(u32 width);
+void setMainWindowHeight(u32 height);
+void setElfViewer(const std::vector<std::string>& elfList);
+void setRecentFiles(const std::vector<std::string>& recentFiles);
+void setEmulatorLanguage(std::string language);
 
+u32 getMainWindowGeometryX();
+u32 getMainWindowGeometryY();
+u32 getMainWindowGeometryW();
+u32 getMainWindowGeometryH();
 const std::vector<std::filesystem::path> getGameInstallDirs();
 const std::vector<bool> getGameInstallDirsEnabled();
 std::filesystem::path getAddonInstallDir();
+u32 getMainWindowTheme();
+u32 getIconSize();
+u32 getIconSizeGrid();
+u32 getSliderPosition();
+u32 getSliderPositionGrid();
+u32 getTableMode();
+u32 getMainWindowWidth();
+u32 getMainWindowHeight();
+std::vector<std::string> getElfViewer();
+std::vector<std::string> getRecentFiles();
+std::string getEmulatorLanguage();
 
 void setDefaultValues();
 
 // todo: name and function location pending
 std::filesystem::path GetFoolproofKbmConfigFile(const std::string& game_id = "");
 
+// settings
+u32 GetLanguage();
 }; // namespace Config

src/common/elf_info.h

@@ -71,7 +71,6 @@ class ElfInfo {
     PSFAttributes psf_attributes{};
 
     std::filesystem::path splash_path{};
-    std::filesystem::path game_folder{};
 
 public:
     static constexpr u32 FW_15 = 0x1500000;
@@ -124,10 +123,6 @@ public:
     [[nodiscard]] const std::filesystem::path& GetSplashPath() const {
         return splash_path;
     }
-
-    [[nodiscard]] const std::filesystem::path& GetGameFolder() const {
-        return game_folder;
-    }
 };
 
 } // namespace Common

src/common/io_file.cpp

@@ -131,7 +131,9 @@ namespace {
     case SeekOrigin::End:
         return SEEK_END;
     default:
-        UNREACHABLE_MSG("Impossible SeekOrigin {}", static_cast<u32>(origin));
+        LOG_ERROR(Common_Filesystem, "Unsupported origin {}, defaulting to SEEK_SET",
+                  static_cast<u32>(origin));
+        return SEEK_SET;
     }
 }
 

src/common/io_file.h

@@ -61,6 +61,8 @@ enum class SeekOrigin : u32 {
     SetOrigin,       // Seeks from the start of the file.
     CurrentPosition, // Seeks from the current file pointer position.
     End,             // Seeks from the end of the file.
+    SeekHole,        // Seeks from the start of the next hole in the file.
+    SeekData,        // Seeks from the start of the next non-hole region in the file.
 };
 
 class IOFile final {
@@ -186,9 +188,7 @@ public:
 
     template <typename T>
     size_t WriteRaw(const void* data, size_t size) const {
-        auto bytes = std::fwrite(data, sizeof(T), size, file);
+        return std::fwrite(data, sizeof(T), size, file);
-        std::fflush(file);
-        return bytes;
     }
 
     template <typename T>

src/common/logging/filter.cpp

@@ -137,11 +137,6 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
     SUB(Lib, NpParty)                                                                              \
     SUB(Lib, Zlib)                                                                                 \
     SUB(Lib, Hmd)                                                                                  \
-    SUB(Lib, SigninDialog)                                                                         \
-    SUB(Lib, Camera)                                                                               \
-    SUB(Lib, CompanionHttpd)                                                                       \
-    SUB(Lib, CompanionUtil)                                                                        \
-    SUB(Lib, Voice)                                                                                \
     CLS(Frontend)                                                                                  \
     CLS(Render)                                                                                    \
     SUB(Render, Vulkan)                                                                            \

src/common/logging/types.h

@@ -98,17 +98,12 @@ enum class Class : u8 {
     Lib_Fiber,             ///< The LibSceFiber implementation.
     Lib_Vdec2,             ///< The LibSceVideodec2 implementation.
     Lib_Videodec,          ///< The LibSceVideodec implementation.
-    Lib_Voice,             ///< The LibSceVoice implementation.
     Lib_RazorCpu,          ///< The LibRazorCpu implementation.
     Lib_Mouse,             ///< The LibSceMouse implementation
     Lib_WebBrowserDialog,  ///< The LibSceWebBrowserDialog implementation
     Lib_NpParty,           ///< The LibSceNpParty implementation
     Lib_Zlib,              ///< The LibSceZlib implementation.
     Lib_Hmd,               ///< The LibSceHmd implementation.
-    Lib_SigninDialog,      ///< The LibSigninDialog implementation.
-    Lib_Camera,            ///< The LibCamera implementation.
-    Lib_CompanionHttpd,    ///< The LibCompanionHttpd implementation.
-    Lib_CompanionUtil,     ///< The LibCompanionUtil implementation.
     Frontend,              ///< Emulator UI
     Render,                ///< Video Core
     Render_Vulkan,         ///< Vulkan backend

src/common/memory_patcher.cpp

@@ -23,7 +23,7 @@
 
 namespace MemoryPatcher {
 
-EXPORT uintptr_t g_eboot_address;
+uintptr_t g_eboot_address;
 uint64_t g_eboot_image_size;
 std::string g_game_serial;
 std::string patchFile;
@@ -169,8 +169,7 @@ void OnGameLoaded() {
                             if (type == "mask_jump32")
                                 patchMask = MemoryPatcher::PatchMask::Mask_Jump32;
 
-                            if ((type == "mask" || type == "mask_jump32") &&
+                            if (type == "mask" || type == "mask_jump32" && !maskOffsetStr.empty()) {
-                                !maskOffsetStr.empty()) {
                                 maskOffsetValue = std::stoi(maskOffsetStr, 0, 10);
                             }
 

src/common/memory_patcher.h

@@ -6,15 +6,9 @@
 #include <string>
 #include <vector>
 
-#if defined(WIN32)
-#define EXPORT __declspec(dllexport)
-#else
-#define EXPORT __attribute__((visibility("default")))
-#endif
-
 namespace MemoryPatcher {
 
-extern EXPORT uintptr_t g_eboot_address;
+extern uintptr_t g_eboot_address;
 extern uint64_t g_eboot_image_size;
 extern std::string g_game_serial;
 extern std::string patchFile;

src/common/path_util.cpp

@@ -128,6 +128,7 @@ static auto UserPaths = [] {
     create_path(PathType::LogDir, user_dir / LOG_DIR);
     create_path(PathType::ScreenshotsDir, user_dir / SCREENSHOTS_DIR);
     create_path(PathType::ShaderDir, user_dir / SHADER_DIR);
+    create_path(PathType::SaveDataDir, user_dir / SAVEDATA_DIR);
     create_path(PathType::GameDataDir, user_dir / GAMEDATA_DIR);
     create_path(PathType::TempDataDir, user_dir / TEMPDATA_DIR);
     create_path(PathType::SysModuleDir, user_dir / SYSMODULES_DIR);

src/common/path_util.h

@@ -18,6 +18,7 @@ enum class PathType {
     LogDir,         // Where log files are stored.
     ScreenshotsDir, // Where screenshots are stored.
     ShaderDir,      // Where shaders are stored.
+    SaveDataDir,    // Where guest save data is stored.
     TempDataDir,    // Where game temp data is stored.
     GameDataDir,    // Where game data is stored.
     SysModuleDir,   // Where system modules are stored.
@@ -35,6 +36,7 @@ constexpr auto PORTABLE_DIR = "user";
 constexpr auto LOG_DIR = "log";
 constexpr auto SCREENSHOTS_DIR = "screenshots";
 constexpr auto SHADER_DIR = "shader";
+constexpr auto SAVEDATA_DIR = "savedata";
 constexpr auto GAMEDATA_DIR = "data";
 constexpr auto TEMPDATA_DIR = "temp";
 constexpr auto SYSMODULES_DIR = "sys_modules";

src/common/range_lock.h

@@ -1,101 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <iterator>
-#include <mutex>
-
-namespace Common {
-
-// From boost thread locking
-
-template <typename Iterator>
-struct RangeLockGuard {
-    Iterator begin;
-    Iterator end;
-
-    RangeLockGuard(Iterator begin_, Iterator end_) : begin(begin_), end(end_) {
-        LockRange(begin, end);
-    }
-
-    void release() {
-        begin = end;
-    }
-
-    ~RangeLockGuard() {
-        for (; begin != end; ++begin) {
-            begin->unlock();
-        }
-    }
-};
-
-template <typename Iterator>
-Iterator TryLockRange(Iterator begin, Iterator end) {
-    using LockType = typename std::iterator_traits<Iterator>::value_type;
-
-    if (begin == end) {
-        return end;
-    }
-
-    std::unique_lock<LockType> guard(*begin, std::try_to_lock);
-    if (!guard.owns_lock()) {
-        return begin;
-    }
-
-    Iterator failed = TryLockRange(++begin, end);
-    if (failed == end) {
-        guard.release();
-    }
-
-    return failed;
-}
-
-template <typename Iterator>
-void LockRange(Iterator begin, Iterator end) {
-    using LockType = typename std::iterator_traits<Iterator>::value_type;
-
-    if (begin == end) {
-        return;
-    }
-
-    bool start_with_begin = true;
-    Iterator second = begin;
-    ++second;
-    Iterator next = second;
-
-    while (true) {
-        std::unique_lock<LockType> begin_lock(*begin, std::defer_lock);
-        if (start_with_begin) {
-            begin_lock.lock();
-
-            const Iterator failed_lock = TryLockRange(next, end);
-            if (failed_lock == end) {
-                begin_lock.release();
-                return;
-            }
-
-            start_with_begin = false;
-            next = failed_lock;
-        } else {
-            RangeLockGuard<Iterator> guard(next, end);
-
-            if (begin_lock.try_lock()) {
-                const Iterator failed_lock = TryLockRange(second, next);
-                if (failed_lock == next) {
-                    begin_lock.release();
-                    guard.release();
-                    return;
-                }
-
-                start_with_begin = false;
-                next = failed_lock;
-            } else {
-                start_with_begin = true;
-                next = second;
-            }
-        }
-    }
-}
-
-} // namespace Common

src/common/recursive_lock.cpp

@@ -1,37 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <unordered_map>
-#include "common/assert.h"
-#include "common/recursive_lock.h"
-
-namespace Common::Detail {
-
-struct RecursiveLockState {
-    RecursiveLockType type;
-    int count;
-};
-
-thread_local std::unordered_map<void*, RecursiveLockState> g_recursive_locks;
-
-bool IncrementRecursiveLock(void* mutex, RecursiveLockType type) {
-    auto& state = g_recursive_locks[mutex];
-    if (state.count == 0) {
-        ASSERT(state.type == RecursiveLockType::None);
-        state.type = type;
-    }
-    ASSERT(state.type == type);
-    return state.count++ == 0;
-}
-
-bool DecrementRecursiveLock(void* mutex, RecursiveLockType type) {
-    auto& state = g_recursive_locks[mutex];
-    ASSERT(state.type == type && state.count > 0);
-    if (--state.count == 0) {
-        g_recursive_locks.erase(mutex);
-        return true;
-    }
-    return false;
-}
-
-} // namespace Common::Detail

src/common/recursive_lock.h

@@ -1,67 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <mutex>
-#include <optional>
-#include <shared_mutex>
-
-namespace Common {
-
-namespace Detail {
-
-enum class RecursiveLockType { None, Shared, Exclusive };
-
-bool IncrementRecursiveLock(void* mutex, RecursiveLockType type);
-bool DecrementRecursiveLock(void* mutex, RecursiveLockType type);
-
-} // namespace Detail
-
-template <typename MutexType>
-class RecursiveScopedLock {
-public:
-    explicit RecursiveScopedLock(MutexType& mutex) : m_mutex(mutex), m_locked(false) {
-        if (Detail::IncrementRecursiveLock(&m_mutex, Detail::RecursiveLockType::Exclusive)) {
-            m_locked = true;
-            m_lock.emplace(m_mutex);
-        }
-    }
-
-    ~RecursiveScopedLock() {
-        Detail::DecrementRecursiveLock(&m_mutex, Detail::RecursiveLockType::Exclusive);
-        if (m_locked) {
-            m_lock.reset();
-        }
-    }
-
-private:
-    MutexType& m_mutex;
-    std::optional<std::unique_lock<MutexType>> m_lock;
-    bool m_locked = false;
-};
-
-template <typename MutexType>
-class RecursiveSharedLock {
-public:
-    explicit RecursiveSharedLock(MutexType& mutex) : m_mutex(mutex), m_locked(false) {
-        if (Detail::IncrementRecursiveLock(&m_mutex, Detail::RecursiveLockType::Shared)) {
-            m_locked = true;
-            m_lock.emplace(m_mutex);
-        }
-    }
-
-    ~RecursiveSharedLock() {
-        Detail::DecrementRecursiveLock(&m_mutex, Detail::RecursiveLockType::Shared);
-        if (m_locked) {
-            m_lock.reset();
-        }
-    }
-
-private:
-    MutexType& m_mutex;
-    std::optional<std::shared_lock<MutexType>> m_lock;
-    bool m_locked = false;
-};
-
-} // namespace Common

src/common/scm_rev.cpp.in

@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <string>
-
 #include "common/scm_rev.h"
 
 namespace Common {
@@ -17,26 +15,5 @@ constexpr char g_scm_remote_name[] = "@GIT_REMOTE_NAME@";
 constexpr char g_scm_remote_url[]  = "@GIT_REMOTE_URL@";
 constexpr char g_scm_date[]        = "@BUILD_DATE@";
 
-const std::string GetRemoteNameFromLink() {
-    std::string remote_url(Common::g_scm_remote_url);
-    std::string remote_host;
-    try {
-        if (remote_url.starts_with("http")) {
-            if (*remote_url.rbegin() == '/') {
-                remote_url.pop_back();
-            }
-            remote_host = remote_url.substr(19, remote_url.rfind('/') - 19);
-        } else if (remote_url.starts_with("git@")) {
-            auto after_comma_pos = remote_url.find(':') + 1, slash_pos = remote_url.find('/');
-            remote_host = remote_url.substr(after_comma_pos, slash_pos - after_comma_pos);
-        } else {
-            remote_host = "unknown";
-        }
-    } catch (...) {
-        remote_host = "unknown";
-    }
-    return remote_host;
-}
-
 } // namespace
 

src/common/scm_rev.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <string>
-
 namespace Common {
 
 extern const char g_version[];
@@ -17,6 +15,4 @@ extern const char g_scm_remote_name[];
 extern const char g_scm_remote_url[];
 extern const char g_scm_date[];
 
-const std::string GetRemoteNameFromLink();
-
 } // namespace Common

src/common/shared_first_mutex.h

@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <condition_variable>
-#include <mutex>
-
-namespace Common {
-
-// Like std::shared_mutex, but reader has priority over writer.
-class SharedFirstMutex {
-public:
-    void lock() {
-        std::unique_lock<std::mutex> lock(mtx);
-        cv.wait(lock, [this]() { return !writer_active && readers == 0; });
-        writer_active = true;
-    }
-
-    void unlock() {
-        std::lock_guard<std::mutex> lock(mtx);
-        writer_active = false;
-        cv.notify_all();
-    }
-
-    void lock_shared() {
-        std::unique_lock<std::mutex> lock(mtx);
-        cv.wait(lock, [this]() { return !writer_active; });
-        ++readers;
-    }
-
-    void unlock_shared() {
-        std::lock_guard<std::mutex> lock(mtx);
-        if (--readers == 0) {
-            cv.notify_all();
-        }
-    }
-
-private:
-    std::mutex mtx;
-    std::condition_variable cv;
-    int readers = 0;
-    bool writer_active = false;
-};
-
-} // namespace Common

src/common/slot_vector.h

@@ -14,9 +14,6 @@ namespace Common {
 struct SlotId {
     static constexpr u32 INVALID_INDEX = std::numeric_limits<u32>::max();
 
-    SlotId() noexcept = default;
-    constexpr SlotId(u32 index) noexcept : index(index) {}
-
     constexpr auto operator<=>(const SlotId&) const noexcept = default;
 
     constexpr explicit operator bool() const noexcept {
@@ -31,63 +28,6 @@ class SlotVector {
     constexpr static std::size_t InitialCapacity = 2048;
 
 public:
-    template <typename ValueType, typename Pointer, typename Reference>
-    class Iterator {
-    public:
-        using iterator_category = std::forward_iterator_tag;
-        using value_type = ValueType;
-        using difference_type = std::ptrdiff_t;
-        using pointer = Pointer;
-        using reference = Reference;
-
-        Iterator(SlotVector& vector_, SlotId index_) : vector(vector_), slot(index_) {
-            AdvanceToValid();
-        }
-
-        reference operator*() const {
-            return vector[slot];
-        }
-
-        pointer operator->() const {
-            return &vector[slot];
-        }
-
-        Iterator& operator++() {
-            ++slot.index;
-            AdvanceToValid();
-            return *this;
-        }
-
-        Iterator operator++(int) {
-            Iterator temp = *this;
-            ++(*this);
-            return temp;
-        }
-
-        bool operator==(const Iterator& other) const {
-            return slot == other.slot;
-        }
-
-        bool operator!=(const Iterator& other) const {
-            return !(*this == other);
-        }
-
-    private:
-        void AdvanceToValid() {
-            while (slot < vector.values_capacity && !vector.ReadStorageBit(slot.index)) {
-                ++slot.index;
-            }
-        }
-
-        SlotVector& vector;
-        SlotId slot;
-    };
-
-    using iterator = Iterator<T, T*, T&>;
-    using const_iterator = Iterator<const T, const T*, const T&>;
-    using reverse_iterator = std::reverse_iterator<iterator>;
-    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
     SlotVector() {
         Reserve(InitialCapacity);
     }
@@ -120,7 +60,7 @@ public:
     }
 
     template <typename... Args>
-    SlotId insert(Args&&... args) noexcept {
+    [[nodiscard]] SlotId insert(Args&&... args) noexcept {
         const u32 index = FreeValueIndex();
         new (&values[index].object) T(std::forward<Args>(args)...);
         SetStorageBit(index);
@@ -138,54 +78,6 @@ public:
         return values_capacity - free_list.size();
     }
 
-    iterator begin() noexcept {
-        return iterator(*this, 0);
-    }
-
-    const_iterator begin() const noexcept {
-        return const_iterator(*this, 0);
-    }
-
-    const_iterator cbegin() const noexcept {
-        return begin();
-    }
-
-    iterator end() noexcept {
-        return iterator(*this, values_capacity);
-    }
-
-    const_iterator end() const noexcept {
-        return const_iterator(*this, values_capacity);
-    }
-
-    const_iterator cend() const noexcept {
-        return end();
-    }
-
-    reverse_iterator rbegin() noexcept {
-        return reverse_iterator(end());
-    }
-
-    const_reverse_iterator rbegin() const noexcept {
-        return const_reverse_iterator(end());
-    }
-
-    const_reverse_iterator crbegin() const noexcept {
-        return rbegin();
-    }
-
-    reverse_iterator rend() noexcept {
-        return reverse_iterator(begin());
-    }
-
-    const_reverse_iterator rend() const noexcept {
-        return const_reverse_iterator(begin());
-    }
-
-    const_reverse_iterator crend() const noexcept {
-        return rend();
-    }
-
 private:
     struct NonTrivialDummy {
         NonTrivialDummy() noexcept {}

src/common/thread.cpp

@@ -2,7 +2,6 @@
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <ctime>
 #include <string>
 #include <thread>
 
@@ -105,24 +104,14 @@ void SetCurrentThreadPriority(ThreadPriority new_priority) {
     SetThreadPriority(handle, windows_priority);
 }
 
-bool AccurateSleep(const std::chrono::nanoseconds duration, std::chrono::nanoseconds* remaining,
+static void AccurateSleep(std::chrono::nanoseconds duration) {
-                   const bool interruptible) {
-    const auto begin_sleep = std::chrono::high_resolution_clock::now();
-
     LARGE_INTEGER interval{
         .QuadPart = -1 * (duration.count() / 100u),
     };
     HANDLE timer = ::CreateWaitableTimer(NULL, TRUE, NULL);
     SetWaitableTimer(timer, &interval, 0, NULL, NULL, 0);
-    const auto ret = WaitForSingleObjectEx(timer, INFINITE, interruptible);
+    WaitForSingleObject(timer, INFINITE);
     ::CloseHandle(timer);
-
-    if (remaining) {
-        const auto end_sleep = std::chrono::high_resolution_clock::now();
-        const auto sleep_time = end_sleep - begin_sleep;
-        *remaining = duration > sleep_time ? duration - sleep_time : std::chrono::nanoseconds(0);
-    }
-    return ret == WAIT_OBJECT_0;
 }
 
 #else
@@ -145,24 +134,8 @@ void SetCurrentThreadPriority(ThreadPriority new_priority) {
     pthread_setschedparam(this_thread, scheduling_type, &params);
 }
 
-bool AccurateSleep(const std::chrono::nanoseconds duration, std::chrono::nanoseconds* remaining,
+static void AccurateSleep(std::chrono::nanoseconds duration) {
-                   const bool interruptible) {
+    std::this_thread::sleep_for(duration);
-    timespec request = {
-        .tv_sec = duration.count() / 1'000'000'000,
-        .tv_nsec = duration.count() % 1'000'000'000,
-    };
-    timespec remain;
-    int ret;
-    while ((ret = nanosleep(&request, &remain)) < 0 && errno == EINTR) {
-        if (interruptible) {
-            break;
-        }
-        request = remain;
-    }
-    if (remaining) {
-        *remaining = std::chrono::nanoseconds(remain.tv_sec * 1'000'000'000 + remain.tv_nsec);
-    }
-    return ret == 0 || errno != EINTR;
 }
 
 #endif
@@ -223,9 +196,9 @@ AccurateTimer::AccurateTimer(std::chrono::nanoseconds target_interval)
     : target_interval(target_interval) {}
 
 void AccurateTimer::Start() {
-    const auto begin_sleep = std::chrono::high_resolution_clock::now();
+    auto begin_sleep = std::chrono::high_resolution_clock::now();
     if (total_wait.count() > 0) {
-        AccurateSleep(total_wait, nullptr, false);
+        AccurateSleep(total_wait);
     }
     start_time = std::chrono::high_resolution_clock::now();
     total_wait -= std::chrono::duration_cast<std::chrono::nanoseconds>(start_time - begin_sleep);

src/common/thread.h

@@ -25,9 +25,6 @@ void SetCurrentThreadName(const char* name);
 
 void SetThreadName(void* thread, const char* name);
 
-bool AccurateSleep(std::chrono::nanoseconds duration, std::chrono::nanoseconds* remaining,
-                   bool interruptible);
-
 class AccurateTimer {
     std::chrono::nanoseconds target_interval{};
     std::chrono::nanoseconds total_wait{};

src/common/va_ctx.h

@@ -8,7 +8,7 @@
 #define VA_ARGS                                                                                    \
     uint64_t rdi, uint64_t rsi, uint64_t rdx, uint64_t rcx, uint64_t r8, uint64_t r9,              \
         uint64_t overflow_arg_area, __m128 xmm0, __m128 xmm1, __m128 xmm2, __m128 xmm3,            \
-        __m128 xmm4, __m128 xmm5, __m128 xmm6, __m128 xmm7
+        __m128 xmm4, __m128 xmm5, __m128 xmm6, __m128 xmm7, ...
 
 #define VA_CTX(ctx)                                                                                \
     alignas(16)::Common::VaCtx ctx{};                                                              \

src/core/address_space.cpp

@@ -302,15 +302,14 @@ struct AddressSpace::Impl {
             new_flags = PAGE_READWRITE;
         } else if (read && !write) {
             new_flags = PAGE_READONLY;
-        } else if (execute && !read && !write) {
+        } else if (execute && !read && not write) {
             new_flags = PAGE_EXECUTE;
         } else if (!read && !write && !execute) {
             new_flags = PAGE_NOACCESS;
         } else {
             LOG_CRITICAL(Common_Memory,
-                         "Unsupported protection flag combination for address {:#x}, size {}, "
+                         "Unsupported protection flag combination for address {:#x}, size {}",
-                         "read={}, write={}, execute={}",
+                         virtual_addr, size);
-                         virtual_addr, size, read, write, execute);
             return;
         }
 
@@ -358,17 +357,9 @@ enum PosixPageProtection {
 [[nodiscard]] constexpr PosixPageProtection ToPosixProt(Core::MemoryProt prot) {
     if (True(prot & Core::MemoryProt::CpuReadWrite) ||
         True(prot & Core::MemoryProt::GpuReadWrite)) {
-        if (True(prot & Core::MemoryProt::CpuExec)) {
+        return PAGE_READWRITE;
-            return PAGE_EXECUTE_READWRITE;
-        } else {
-            return PAGE_READWRITE;
-        }
     } else if (True(prot & Core::MemoryProt::CpuRead) || True(prot & Core::MemoryProt::GpuRead)) {
-        if (True(prot & Core::MemoryProt::CpuExec)) {
+        return PAGE_READONLY;
-            return PAGE_EXECUTE_READ;
-        } else {
-            return PAGE_READONLY;
-        }
     } else {
         return PAGE_NOACCESS;
     }

src/core/address_space.h

@@ -11,7 +11,6 @@
 namespace Core {
 
 enum class MemoryPermission : u32 {
-    None = 0,
     Read = 1 << 0,
     Write = 1 << 1,
     ReadWrite = Read | Write,
@@ -20,6 +19,8 @@ enum class MemoryPermission : u32 {
 };
 DECLARE_ENUM_FLAG_OPERATORS(MemoryPermission)
 
+constexpr VAddr CODE_BASE_OFFSET = 0x100000000ULL;
+
 constexpr VAddr SYSTEM_MANAGED_MIN = 0x00000400000ULL;
 constexpr VAddr SYSTEM_MANAGED_MAX = 0x07FFFFBFFFULL;
 constexpr VAddr SYSTEM_RESERVED_MIN = 0x07FFFFC000ULL;

src/core/cpu_patches.cpp

@@ -88,8 +88,7 @@ static bool FilterTcbAccess(const ZydisDecodedOperand* operands) {
            dst_op.reg.value <= ZYDIS_REGISTER_R15;
 }
 
-static void GenerateTcbAccess(void* /* address */, const ZydisDecodedOperand* operands,
+static void GenerateTcbAccess(const ZydisDecodedOperand* operands, Xbyak::CodeGenerator& c) {
-                              Xbyak::CodeGenerator& c) {
     const auto dst = ZydisToXbyakRegisterOperand(operands[0]);
 
 #if defined(_WIN32)
@@ -127,8 +126,7 @@ static bool FilterNoSSE4a(const ZydisDecodedOperand*) {
     return !cpu.has(Cpu::tSSE4a);
 }
 
-static void GenerateEXTRQ(void* /* address */, const ZydisDecodedOperand* operands,
+static void GenerateEXTRQ(const ZydisDecodedOperand* operands, Xbyak::CodeGenerator& c) {
-                          Xbyak::CodeGenerator& c) {
     bool immediateForm = operands[1].type == ZYDIS_OPERAND_TYPE_IMMEDIATE &&
                          operands[2].type == ZYDIS_OPERAND_TYPE_IMMEDIATE;
 
@@ -163,9 +161,7 @@ static void GenerateEXTRQ(void* /* address */, const ZydisDecodedOperand* operan
             mask = (1ULL << length) - 1;
         }
 
-        if (length + index > 64) {
+        ASSERT_MSG(length + index <= 64, "length + index must be less than or equal to 64.");
-            mask = 0xFFFF'FFFF'FFFF'FFFF;
-        }
 
         // Get lower qword from xmm register
         c.vmovq(scratch1, xmm_dst);
@@ -179,8 +175,8 @@ static void GenerateEXTRQ(void* /* address */, const ZydisDecodedOperand* operan
         c.mov(scratch2, mask);
         c.and_(scratch1, scratch2);
 
-        // Writeback to xmm register, extrq instruction says top 64-bits are undefined but zeroed on
+        // Writeback to xmm register, extrq instruction says top 64-bits are undefined so we don't
-        // AMD CPUs
+        // care to preserve them
         c.vmovq(xmm_dst, scratch1);
 
         c.pop(scratch2);
@@ -249,8 +245,7 @@ static void GenerateEXTRQ(void* /* address */, const ZydisDecodedOperand* operan
     }
 }
 
-static void GenerateINSERTQ(void* /* address */, const ZydisDecodedOperand* operands,
+static void GenerateINSERTQ(const ZydisDecodedOperand* operands, Xbyak::CodeGenerator& c) {
-                            Xbyak::CodeGenerator& c) {
     bool immediateForm = operands[2].type == ZYDIS_OPERAND_TYPE_IMMEDIATE &&
                          operands[3].type == ZYDIS_OPERAND_TYPE_IMMEDIATE;
 
@@ -289,9 +284,7 @@ static void GenerateINSERTQ(void* /* address */, const ZydisDecodedOperand* oper
             mask_value = (1ULL << length) - 1;
         }
 
-        if (length + index > 64) {
+        ASSERT_MSG(length + index <= 64, "length + index must be less than or equal to 64.");
-            mask_value = 0xFFFF'FFFF'FFFF'FFFF;
-        }
 
         c.vmovq(scratch1, xmm_src);
         c.vmovq(scratch2, xmm_dst);
@@ -311,9 +304,8 @@ static void GenerateINSERTQ(void* /* address */, const ZydisDecodedOperand* oper
         // dst |= src
         c.or_(scratch2, scratch1);
 
-        // Insert scratch2 into low 64 bits of dst, upper 64 bits are undefined but zeroed on AMD
+        // Insert scratch2 into low 64 bits of dst, upper 64 bits are unaffected
-        // CPUs
+        c.vpinsrq(xmm_dst, xmm_dst, scratch2, 0);
-        c.vmovq(xmm_dst, scratch2);
 
         c.pop(mask);
         c.pop(scratch2);
@@ -379,7 +371,7 @@ static void GenerateINSERTQ(void* /* address */, const ZydisDecodedOperand* oper
         c.and_(scratch2, mask);
         c.or_(scratch2, scratch1);
 
-        // Upper 64 bits are undefined in insertq but AMD CPUs zero them
+        // Upper 64 bits are undefined in insertq
         c.vmovq(xmm_dst, scratch2);
 
         c.pop(mask);
@@ -391,44 +383,8 @@ static void GenerateINSERTQ(void* /* address */, const ZydisDecodedOperand* oper
     }
 }
 
-static void ReplaceMOVNT(void* address, u8 rep_prefix) {
-    // Find the opcode byte
-    // There can be any amount of prefixes but the instruction can't be more than 15 bytes
-    // And we know for sure this is a MOVNTSS/MOVNTSD
-    bool found = false;
-    bool rep_prefix_found = false;
-    int index = 0;
-    u8* ptr = reinterpret_cast<u8*>(address);
-    for (int i = 0; i < 15; i++) {
-        if (ptr[i] == rep_prefix) {
-            rep_prefix_found = true;
-        } else if (ptr[i] == 0x2B) {
-            index = i;
-            found = true;
-            break;
-        }
-    }
-
-    // Some sanity checks
-    ASSERT(found);
-    ASSERT(index >= 2);
-    ASSERT(ptr[index - 1] == 0x0F);
-    ASSERT(rep_prefix_found);
-
-    // This turns the MOVNTSS/MOVNTSD to a MOVSS/MOVSD m, xmm
-    ptr[index] = 0x11;
-}
-
-static void ReplaceMOVNTSS(void* address, const ZydisDecodedOperand*, Xbyak::CodeGenerator&) {
-    ReplaceMOVNT(address, 0xF3);
-}
-
-static void ReplaceMOVNTSD(void* address, const ZydisDecodedOperand*, Xbyak::CodeGenerator&) {
-    ReplaceMOVNT(address, 0xF2);
-}
-
 using PatchFilter = bool (*)(const ZydisDecodedOperand*);
-using InstructionGenerator = void (*)(void*, const ZydisDecodedOperand*, Xbyak::CodeGenerator&);
+using InstructionGenerator = void (*)(const ZydisDecodedOperand*, Xbyak::CodeGenerator&);
 struct PatchInfo {
     /// Filter for more granular patch conditions past just the instruction mnemonic.
     PatchFilter filter;
@@ -444,8 +400,6 @@ static const std::unordered_map<ZydisMnemonic, PatchInfo> Patches = {
     // SSE4a
     {ZYDIS_MNEMONIC_EXTRQ, {FilterNoSSE4a, GenerateEXTRQ, true}},
     {ZYDIS_MNEMONIC_INSERTQ, {FilterNoSSE4a, GenerateINSERTQ, true}},
-    {ZYDIS_MNEMONIC_MOVNTSS, {FilterNoSSE4a, ReplaceMOVNTSS, false}},
-    {ZYDIS_MNEMONIC_MOVNTSD, {FilterNoSSE4a, ReplaceMOVNTSD, false}},
 
 #if defined(_WIN32)
     // Windows needs a trampoline.
@@ -510,8 +464,9 @@ static std::pair<bool, u64> TryPatch(u8* code, PatchModule* module) {
 
             if (needs_trampoline && instruction.length < 5) {
                 // Trampoline is needed but instruction is too short to patch.
-                // Return false and length to signal to AOT compilation that this instruction
+                // Return false and length to fall back to the illegal instruction handler,
-                // should be skipped and handled at runtime.
+                // or to signal to AOT compilation that this instruction should be skipped and
+                // handled at runtime.
                 return std::make_pair(false, instruction.length);
             }
 
@@ -523,7 +478,7 @@ static std::pair<bool, u64> TryPatch(u8* code, PatchModule* module) {
                 auto& trampoline_gen = module->trampoline_gen;
                 const auto trampoline_ptr = trampoline_gen.getCurr();
 
-                patch_info.generator(code, operands, trampoline_gen);
+                patch_info.generator(operands, trampoline_gen);
 
                 // Return to the following instruction at the end of the trampoline.
                 trampoline_gen.jmp(code + instruction.length);
@@ -531,7 +486,7 @@ static std::pair<bool, u64> TryPatch(u8* code, PatchModule* module) {
                 // Replace instruction with near jump to the trampoline.
                 patch_gen.jmp(trampoline_ptr, Xbyak::CodeGenerator::LabelType::T_NEAR);
             } else {
-                patch_info.generator(code, operands, patch_gen);
+                patch_info.generator(operands, patch_gen);
             }
 
             const auto patch_size = patch_gen.getCurr() - code;
@@ -557,139 +512,136 @@ static std::pair<bool, u64> TryPatch(u8* code, PatchModule* module) {
 
 #if defined(ARCH_X86_64)
 
-static bool Is4ByteExtrqOrInsertq(void* code_address) {
-    u8* bytes = (u8*)code_address;
-    if (bytes[0] == 0x66 && bytes[1] == 0x0F && bytes[2] == 0x79) {
-        return true; // extrq
-    } else if (bytes[0] == 0xF2 && bytes[1] == 0x0F && bytes[2] == 0x79) {
-        return true; // insertq
-    } else {
-        return false;
-    }
-}
-
 static bool TryExecuteIllegalInstruction(void* ctx, void* code_address) {
-    // We need to decode the instruction to find out what it is. Normally we'd use a fully fleshed
+    ZydisDecodedInstruction instruction;
-    // out decoder like Zydis, however Zydis does a bunch of stuff that impact performance that we
+    ZydisDecodedOperand operands[ZYDIS_MAX_OPERAND_COUNT];
-    // don't care about. We can get information about the instruction a lot faster by writing a mini
+    const auto status =
-    // decoder here, since we know it is definitely an extrq or an insertq. If for some reason we
+        Common::Decoder::Instance()->decodeInstruction(instruction, operands, code_address);
-    // need to interpret more instructions in the future (I don't see why we would), we can revert
-    // to using Zydis.
-    ZydisMnemonic mnemonic;
-    u8* bytes = (u8*)code_address;
-    if (bytes[0] == 0x66) {
-        mnemonic = ZYDIS_MNEMONIC_EXTRQ;
-    } else if (bytes[0] == 0xF2) {
-        mnemonic = ZYDIS_MNEMONIC_INSERTQ;
-    } else {
-        ZydisDecodedInstruction instruction;
-        ZydisDecodedOperand operands[ZYDIS_MAX_OPERAND_COUNT];
-        const auto status =
-            Common::Decoder::Instance()->decodeInstruction(instruction, operands, code_address);
-        LOG_ERROR(Core, "Unhandled illegal instruction at code address {}: {}",
-                  fmt::ptr(code_address),
-                  ZYAN_SUCCESS(status) ? ZydisMnemonicGetString(instruction.mnemonic)
-                                       : "Failed to decode");
-        return false;
-    }
 
-    ASSERT(bytes[1] == 0x0F && bytes[2] == 0x79);
+    switch (instruction.mnemonic) {
-
-    // Note: It's guaranteed that there's no REX prefix in these instructions checked by
-    // Is4ByteExtrqOrInsertq
-    u8 modrm = bytes[3];
-    u8 rm = modrm & 0b111;
-    u8 reg = (modrm >> 3) & 0b111;
-    u8 mod = (modrm >> 6) & 0b11;
-
-    ASSERT(mod == 0b11); // Any instruction we interpret here uses reg/reg addressing only
-
-    int dstIndex = reg;
-    int srcIndex = rm;
-
-    switch (mnemonic) {
     case ZYDIS_MNEMONIC_EXTRQ: {
-        const auto dst = Common::GetXmmPointer(ctx, dstIndex);
+        bool immediateForm = operands[1].type == ZYDIS_OPERAND_TYPE_IMMEDIATE &&
-        const auto src = Common::GetXmmPointer(ctx, srcIndex);
+                             operands[2].type == ZYDIS_OPERAND_TYPE_IMMEDIATE;
-
+        if (immediateForm) {
-        u64 lowQWordSrc;
+            LOG_CRITICAL(Core, "EXTRQ immediate form should have been patched at code address: {}",
-        memcpy(&lowQWordSrc, src, sizeof(lowQWordSrc));
+                         fmt::ptr(code_address));
-
+            return false;
-        u64 lowQWordDst;
-        memcpy(&lowQWordDst, dst, sizeof(lowQWordDst));
-
-        u64 length = lowQWordSrc & 0x3F;
-        u64 mask;
-        if (length == 0) {
-            length = 64; // for the check below
-            mask = 0xFFFF'FFFF'FFFF'FFFF;
         } else {
-            mask = (1ULL << length) - 1;
+            ASSERT_MSG(operands[0].type == ZYDIS_OPERAND_TYPE_REGISTER &&
+                           operands[1].type == ZYDIS_OPERAND_TYPE_REGISTER &&
+                           operands[0].reg.value >= ZYDIS_REGISTER_XMM0 &&
+                           operands[0].reg.value <= ZYDIS_REGISTER_XMM15 &&
+                           operands[1].reg.value >= ZYDIS_REGISTER_XMM0 &&
+                           operands[1].reg.value <= ZYDIS_REGISTER_XMM15,
+                       "Unexpected operand types for EXTRQ instruction");
+
+            const auto dstIndex = operands[0].reg.value - ZYDIS_REGISTER_XMM0;
+            const auto srcIndex = operands[1].reg.value - ZYDIS_REGISTER_XMM0;
+
+            const auto dst = Common::GetXmmPointer(ctx, dstIndex);
+            const auto src = Common::GetXmmPointer(ctx, srcIndex);
+
+            u64 lowQWordSrc;
+            memcpy(&lowQWordSrc, src, sizeof(lowQWordSrc));
+
+            u64 lowQWordDst;
+            memcpy(&lowQWordDst, dst, sizeof(lowQWordDst));
+
+            u64 length = lowQWordSrc & 0x3F;
+            u64 mask;
+            if (length == 0) {
+                length = 64; // for the check below
+                mask = 0xFFFF'FFFF'FFFF'FFFF;
+            } else {
+                mask = (1ULL << length) - 1;
+            }
+
+            u64 index = (lowQWordSrc >> 8) & 0x3F;
+            if (length + index > 64) {
+                // Undefined behavior if length + index is bigger than 64 according to the spec,
+                // we'll warn and continue execution.
+                LOG_TRACE(Core,
+                          "extrq at {} with length {} and index {} is bigger than 64, "
+                          "undefined behavior",
+                          fmt::ptr(code_address), length, index);
+            }
+
+            lowQWordDst >>= index;
+            lowQWordDst &= mask;
+
+            memcpy(dst, &lowQWordDst, sizeof(lowQWordDst));
+
+            Common::IncrementRip(ctx, instruction.length);
+
+            return true;
         }
-
+        break;
-        u64 index = (lowQWordSrc >> 8) & 0x3F;
-        if (length + index > 64) {
-            // Undefined behavior if length + index is bigger than 64 according to the spec,
-            // we'll warn and continue execution.
-            LOG_TRACE(Core,
-                      "extrq at {} with length {} and index {} is bigger than 64, "
-                      "undefined behavior",
-                      fmt::ptr(code_address), length, index);
-        }
-
-        lowQWordDst >>= index;
-        lowQWordDst &= mask;
-
-        memset((u8*)dst + sizeof(u64), 0, sizeof(u64));
-        memcpy(dst, &lowQWordDst, sizeof(lowQWordDst));
-
-        Common::IncrementRip(ctx, 4);
-
-        return true;
     }
     case ZYDIS_MNEMONIC_INSERTQ: {
-        const auto dst = Common::GetXmmPointer(ctx, dstIndex);
+        bool immediateForm = operands[2].type == ZYDIS_OPERAND_TYPE_IMMEDIATE &&
-        const auto src = Common::GetXmmPointer(ctx, srcIndex);
+                             operands[3].type == ZYDIS_OPERAND_TYPE_IMMEDIATE;
-
+        if (immediateForm) {
-        u64 lowQWordSrc, highQWordSrc;
+            LOG_CRITICAL(Core,
-        memcpy(&lowQWordSrc, src, sizeof(lowQWordSrc));
+                         "INSERTQ immediate form should have been patched at code address: {}",
-        memcpy(&highQWordSrc, (u8*)src + 8, sizeof(highQWordSrc));
+                         fmt::ptr(code_address));
-
+            return false;
-        u64 lowQWordDst;
-        memcpy(&lowQWordDst, dst, sizeof(lowQWordDst));
-
-        u64 length = highQWordSrc & 0x3F;
-        u64 mask;
-        if (length == 0) {
-            length = 64; // for the check below
-            mask = 0xFFFF'FFFF'FFFF'FFFF;
         } else {
-            mask = (1ULL << length) - 1;
+            ASSERT_MSG(operands[2].type == ZYDIS_OPERAND_TYPE_UNUSED &&
+                           operands[3].type == ZYDIS_OPERAND_TYPE_UNUSED,
+                       "operands 2 and 3 must be unused for register form.");
+
+            ASSERT_MSG(operands[0].type == ZYDIS_OPERAND_TYPE_REGISTER &&
+                           operands[1].type == ZYDIS_OPERAND_TYPE_REGISTER,
+                       "operands 0 and 1 must be registers.");
+
+            const auto dstIndex = operands[0].reg.value - ZYDIS_REGISTER_XMM0;
+            const auto srcIndex = operands[1].reg.value - ZYDIS_REGISTER_XMM0;
+
+            const auto dst = Common::GetXmmPointer(ctx, dstIndex);
+            const auto src = Common::GetXmmPointer(ctx, srcIndex);
+
+            u64 lowQWordSrc, highQWordSrc;
+            memcpy(&lowQWordSrc, src, sizeof(lowQWordSrc));
+            memcpy(&highQWordSrc, (u8*)src + 8, sizeof(highQWordSrc));
+
+            u64 lowQWordDst;
+            memcpy(&lowQWordDst, dst, sizeof(lowQWordDst));
+
+            u64 length = highQWordSrc & 0x3F;
+            u64 mask;
+            if (length == 0) {
+                length = 64; // for the check below
+                mask = 0xFFFF'FFFF'FFFF'FFFF;
+            } else {
+                mask = (1ULL << length) - 1;
+            }
+
+            u64 index = (highQWordSrc >> 8) & 0x3F;
+            if (length + index > 64) {
+                // Undefined behavior if length + index is bigger than 64 according to the spec,
+                // we'll warn and continue execution.
+                LOG_TRACE(Core,
+                          "insertq at {} with length {} and index {} is bigger than 64, "
+                          "undefined behavior",
+                          fmt::ptr(code_address), length, index);
+            }
+
+            lowQWordSrc &= mask;
+            lowQWordDst &= ~(mask << index);
+            lowQWordDst |= lowQWordSrc << index;
+
+            memcpy(dst, &lowQWordDst, sizeof(lowQWordDst));
+
+            Common::IncrementRip(ctx, instruction.length);
+
+            return true;
         }
-
+        break;
-        u64 index = (highQWordSrc >> 8) & 0x3F;
-        if (length + index > 64) {
-            // Undefined behavior if length + index is bigger than 64 according to the spec,
-            // we'll warn and continue execution.
-            LOG_TRACE(Core,
-                      "insertq at {} with length {} and index {} is bigger than 64, "
-                      "undefined behavior",
-                      fmt::ptr(code_address), length, index);
-        }
-
-        lowQWordSrc &= mask;
-        lowQWordDst &= ~(mask << index);
-        lowQWordDst |= lowQWordSrc << index;
-
-        memset((u8*)dst + sizeof(u64), 0, sizeof(u64));
-        memcpy(dst, &lowQWordDst, sizeof(lowQWordDst));
-
-        Common::IncrementRip(ctx, 4);
-
-        return true;
     }
     default: {
-        UNREACHABLE();
+        LOG_ERROR(Core, "Unhandled illegal instruction at code address {}: {}",
+                  fmt::ptr(code_address), ZydisMnemonicGetString(instruction.mnemonic));
+        return false;
     }
     }
 
@@ -743,26 +695,9 @@ static bool PatchesAccessViolationHandler(void* context, void* /* fault_address
 
 static bool PatchesIllegalInstructionHandler(void* context) {
     void* code_address = Common::GetRip(context);
-    if (Is4ByteExtrqOrInsertq(code_address)) {
+    if (!TryPatchJit(code_address)) {
-        // The instruction is not big enough for a relative jump, don't try to patch it and pass it
-        // to our illegal instruction interpreter directly
         return TryExecuteIllegalInstruction(context, code_address);
-    } else {
-        if (!TryPatchJit(code_address)) {
-            ZydisDecodedInstruction instruction;
-            ZydisDecodedOperand operands[ZYDIS_MAX_OPERAND_COUNT];
-            const auto status =
-                Common::Decoder::Instance()->decodeInstruction(instruction, operands, code_address);
-            if (ZYAN_SUCCESS(status) && instruction.mnemonic == ZydisMnemonic::ZYDIS_MNEMONIC_UD2)
-                [[unlikely]] {
-                UNREACHABLE_MSG("ud2 at code address {:#x}", (u64)code_address);
-            }
-            LOG_ERROR(Core, "Failed to patch address {:x} -- mnemonic: {}", (u64)code_address,
-                      ZYAN_SUCCESS(status) ? ZydisMnemonicGetString(instruction.mnemonic)
-                                           : "Failed to decode");
-        }
     }
-
     return true;
 }
 

src/core/devices/base_device.h

@@ -40,10 +40,6 @@ public:
         return ORBIS_KERNEL_ERROR_EBADF;
     }
 
-    virtual size_t pwritev(const Libraries::Kernel::SceKernelIovec* iov, int iovcnt, u64 offset) {
-        return ORBIS_KERNEL_ERROR_EBADF;
-    }
-
     virtual s64 lseek(s64 offset, int whence) {
         return ORBIS_KERNEL_ERROR_EBADF;
     }

src/core/devices/random_device.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cstdlib>
-#include <ctime>
 #include "common/logging/log.h"
 #include "random_device.h"
 

src/core/devices/srandom_device.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cstdlib>
-#include <ctime>
 #include "common/logging/log.h"
 #include "srandom_device.h"
 

src/core/devices/urandom_device.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cstdlib>
-#include <ctime>
 #include "common/logging/log.h"
 #include "urandom_device.h"
 

src/core/devtools/layer.cpp

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "SDL3/SDL_log.h"
 #include "layer.h"
 
 #include <imgui.h>
 
-#include "SDL3/SDL_log.h"
 #include "common/config.h"
 #include "common/singleton.h"
 #include "common/types.h"
@@ -17,7 +17,6 @@
 #include "widget/frame_dump.h"
 #include "widget/frame_graph.h"
 #include "widget/memory_map.h"
-#include "widget/module_list.h"
 #include "widget/shader_list.h"
 
 extern std::unique_ptr<Vulkan::Presenter> presenter;
@@ -41,7 +40,6 @@ static bool just_opened_options = false;
 
 static Widget::MemoryMapViewer memory_map;
 static Widget::ShaderList shader_list;
-static Widget::ModuleList module_list;
 
 // clang-format off
 static std::string help_text =
@@ -110,9 +108,6 @@ void L::DrawMenuBar() {
             if (MenuItem("Memory map")) {
                 memory_map.open = true;
             }
-            if (MenuItem("Module list")) {
-                module_list.open = true;
-            }
             ImGui::EndMenu();
         }
 
@@ -261,9 +256,6 @@ void L::DrawAdvanced() {
     if (shader_list.open) {
         shader_list.Draw();
     }
-    if (module_list.open) {
-        module_list.Draw();
-    }
 }
 
 void L::DrawSimple() {

src/core/devtools/options.cpp

@@ -1,14 +1,9 @@
 //  SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 //  SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "options.h"
-
-#include <memory>
 #include <imgui.h>
 
-#include "video_core/renderer_vulkan/vk_presenter.h"
+#include "options.h"
-
-extern std::unique_ptr<Vulkan::Presenter> presenter;
 
 namespace Core::Devtools {
 
@@ -17,7 +12,6 @@ TOptions Options;
 void LoadOptionsConfig(const char* line) {
     char str[512];
     int i;
-    float f;
     if (sscanf(line, "disassembler_cli_isa=%511[^\n]", str) == 1) {
         Options.disassembler_cli_isa = str;
         return;
@@ -30,26 +24,12 @@ void LoadOptionsConfig(const char* line) {
         Options.frame_dump_render_on_collapse = i != 0;
         return;
     }
-    if (sscanf(line, "fsr_enabled=%d", &i) == 1) {
-        presenter->GetFsrSettingsRef().enable = i != 0;
-        return;
-    }
-    if (sscanf(line, "fsr_rcas_enabled=%d", &i) == 1) {
-        presenter->GetFsrSettingsRef().use_rcas = i != 0;
-        return;
-    }
-    if (sscanf(line, "fsr_rcas_attenuation=%f", &f) == 1) {
-        presenter->GetFsrSettingsRef().rcas_attenuation = f;
-    }
 }
 
 void SerializeOptionsConfig(ImGuiTextBuffer* buf) {
     buf->appendf("disassembler_cli_isa=%s\n", Options.disassembler_cli_isa.c_str());
     buf->appendf("disassembler_cli_spv=%s\n", Options.disassembler_cli_spv.c_str());
     buf->appendf("frame_dump_render_on_collapse=%d\n", Options.frame_dump_render_on_collapse);
-    buf->appendf("fsr_enabled=%d\n", presenter->GetFsrSettingsRef().enable);
-    buf->appendf("fsr_rcas_enabled=%d\n", presenter->GetFsrSettingsRef().use_rcas);
-    buf->appendf("fsr_rcas_attenuation=%f\n", presenter->GetFsrSettingsRef().rcas_attenuation);
 }
 
 } // namespace Core::Devtools

src/core/devtools/widget/frame_dump.cpp

@@ -2,7 +2,6 @@
 //  SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cstdio>
-#include <ctime>
 #include <fmt/chrono.h>
 #include <imgui.h>
 #include <magic_enum/magic_enum.hpp>

src/core/devtools/widget/module_list.cpp

@@ -1,55 +0,0 @@
-//  SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-//  SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "module_list.h"
-
-#include <imgui.h>
-
-#include "common.h"
-#include "core/debug_state.h"
-#include "imgui/imgui_std.h"
-
-using namespace ImGui;
-
-namespace Core::Devtools::Widget {
-void ModuleList::Draw() {
-    SetNextWindowSize({550.0f, 600.0f}, ImGuiCond_FirstUseEver);
-    if (!Begin("Module List", &open)) {
-        End();
-        return;
-    }
-
-    if (BeginTable("ModuleTable", 3,
-                   ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Sortable |
-                       ImGuiTableFlags_RowBg)) {
-        TableSetupColumn("Modulname", ImGuiTableColumnFlags_WidthStretch);
-        TableHeadersRow();
-
-        std::scoped_lock lock(modules_mutex);
-        for (const auto& module : modules) {
-            TableNextRow();
-
-            TableSetColumnIndex(0);
-            TextUnformatted(module.name.c_str());
-
-            TableSetColumnIndex(1);
-            if (module.is_sys_module) {
-                TextColored({0.2f, 0.6f, 0.8f, 1.0f}, "System Module");
-            } else {
-                TextColored({0.8f, 0.4f, 0.2f, 1.0f}, "Game Module");
-            }
-
-            TableSetColumnIndex(2);
-            if (module.is_lle) {
-                TextColored({0.4f, 0.7f, 0.4f, 1.0f}, "LLE");
-            } else {
-                TextColored({0.7f, 0.4f, 0.5f, 1.0f}, "HLE");
-            }
-        }
-        EndTable();
-    }
-
-    End();
-}
-
-} // namespace Core::Devtools::Widget

src/core/devtools/widget/module_list.h

@@ -1,82 +0,0 @@
-//  SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-//  SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <algorithm>
-#include <filesystem>
-#include <mutex>
-#include <string>
-#include <vector>
-#include "common/elf_info.h"
-#include "common/path_util.h"
-
-namespace Core::Devtools::Widget {
-
-class ModuleList {
-public:
-    ModuleList() = default;
-    ~ModuleList() = default;
-
-    void Draw();
-    bool open = false;
-
-    static bool IsSystemModule(const std::filesystem::path& path) {
-        const auto sys_modules_path = Common::FS::GetUserPath(Common::FS::PathType::SysModuleDir);
-
-        const auto abs_path = std::filesystem::absolute(path).lexically_normal();
-        const auto abs_sys_path = std::filesystem::absolute(sys_modules_path).lexically_normal();
-
-        const auto path_str = abs_path.string();
-        const auto sys_path_str = abs_sys_path.string();
-
-        return path_str.starts_with(sys_path_str);
-    }
-
-    static bool IsSystemModule(const std::string& name) {
-        const auto game_modules_path = Common::ElfInfo::Instance().GetGameFolder() / "sce_module";
-        const auto prx_path = game_modules_path / name;
-
-        if (!std::filesystem::exists(prx_path)) {
-            return true;
-        }
-        return false;
-    }
-
-    static void AddModule(const std::string& name, std::filesystem::path path) {
-        if (name == "eboot.bin") {
-            return;
-        }
-        std::scoped_lock lock(modules_mutex);
-        modules.push_back({name, IsSystemModule(path), true});
-    }
-
-    static void AddModule(std::string name) {
-        name = name + ".prx";
-        std::scoped_lock lock(modules_mutex);
-
-        bool is_sys_module = IsSystemModule(name);
-        bool is_lle = false;
-        auto it = std::find_if(modules.begin(), modules.end(),
-                               [&name, is_sys_module, is_lle](const ModuleInfo& entry) {
-                                   return entry.name == name && !entry.is_lle;
-                               });
-
-        if (it == modules.end()) {
-            modules.push_back({name, is_sys_module, is_lle});
-        }
-    }
-
-private:
-    struct ModuleInfo {
-        std::string name;
-        bool is_sys_module;
-        bool is_lle;
-    };
-
-    static inline std::mutex modules_mutex;
-
-    static inline std::vector<ModuleInfo> modules;
-};
-
-} // namespace Core::Devtools::Widget

src/core/file_sys/fs.cpp

@@ -10,8 +10,6 @@
 
 namespace Core::FileSys {
 
-bool MntPoints::ignore_game_patches = false;
-
 std::string RemoveTrailingSlashes(const std::string& path) {
     // Remove trailing slashes to make comparisons simpler.
     std::string path_sanitized = path;
@@ -79,7 +77,7 @@ std::filesystem::path MntPoints::GetHostPath(std::string_view path, bool* is_rea
     patch_path /= rel_path;
 
     if ((corrected_path.starts_with("/app0") || corrected_path.starts_with("/hostapp")) &&
-        !force_base_path && !ignore_game_patches && std::filesystem::exists(patch_path)) {
+        !force_base_path && std::filesystem::exists(patch_path)) {
         return patch_path;
     }
 
@@ -139,7 +137,7 @@ std::filesystem::path MntPoints::GetHostPath(std::string_view path, bool* is_rea
         return std::optional<std::filesystem::path>(current_path);
     };
 
-    if (!force_base_path && !ignore_game_patches) {
+    if (!force_base_path) {
         if (const auto path = search(patch_path)) {
             return *path;
         }

src/core/file_sys/fs.h

@@ -21,7 +21,6 @@ class MntPoints {
     static constexpr bool NeedsCaseInsensitiveSearch = true;
 #endif
 public:
-    static bool ignore_game_patches;
     struct MntPair {
         std::filesystem::path host_path;
         std::string mount; // e.g /app0

src/core/libraries/ajm/ajm.cpp

@@ -219,7 +219,7 @@ int PS4_SYSV_ABI sceAjmStrError() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceAjm(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("NVDXiUesSbA", "libSceAjm", 1, "libSceAjm", 1, 1, sceAjmBatchCancel);
     LIB_FUNCTION("WfAiBW8Wcek", "libSceAjm", 1, "libSceAjm", 1, 1, sceAjmBatchErrorDump);
     LIB_FUNCTION("dmDybN--Fn8", "libSceAjm", 1, "libSceAjm", 1, 1, sceAjmBatchJobControlBufferRa);

src/core/libraries/ajm/ajm.h

@@ -229,5 +229,5 @@ int PS4_SYSV_ABI sceAjmModuleRegister(u32 context, AjmCodecType codec_type, s64
 int PS4_SYSV_ABI sceAjmModuleUnregister();
 int PS4_SYSV_ABI sceAjmStrError();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceAjm(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::Ajm

src/core/libraries/app_content/app_content.cpp

@@ -369,7 +369,7 @@ int PS4_SYSV_ABI sceAppContentGetDownloadedStoreCountry() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceAppContent(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("AS45QoYHjc4", "libSceAppContent", 1, "libSceAppContentUtil", 1, 1, _Z5dummyv);
     LIB_FUNCTION("ZiATpP9gEkA", "libSceAppContent", 1, "libSceAppContentUtil", 1, 1,
                  sceAppContentAddcontDelete);

src/core/libraries/app_content/app_content.h

@@ -119,5 +119,5 @@ int PS4_SYSV_ABI sceAppContentGetAddcontInfoByEntitlementId();
 int PS4_SYSV_ABI sceAppContentGetAddcontInfoListByIroTag();
 int PS4_SYSV_ABI sceAppContentGetDownloadedStoreCountry();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceAppContent(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::AppContent

src/core/libraries/audio/audioin.cpp

@@ -3,21 +3,18 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/audio/audioin.h"
-#include "core/libraries/audio/sdl_in.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::AudioIn {
 
-static std::unique_ptr<SDLAudioIn> audio = std::make_unique<SDLAudioIn>();
-
 int PS4_SYSV_ABI sceAudioInChangeAppModuleState() {
     LOG_ERROR(Lib_AudioIn, "(STUBBED) called");
     return ORBIS_OK;
 }
 
-int PS4_SYSV_ABI sceAudioInClose(s32 handle) {
+int PS4_SYSV_ABI sceAudioInClose() {
-    audio->AudioInClose(handle);
+    LOG_ERROR(Lib_AudioIn, "(STUBBED) called");
     return ORBIS_OK;
 }
 
@@ -96,13 +93,9 @@ int PS4_SYSV_ABI sceAudioInGetSilentState() {
     return ORBIS_OK;
 }
 
-int PS4_SYSV_ABI sceAudioInHqOpen(Libraries::UserService::OrbisUserServiceUserId userId, u32 type,
+int PS4_SYSV_ABI sceAudioInHqOpen() {
-                                  u32 index, u32 len, u32 freq, u32 param) {
+    LOG_ERROR(Lib_AudioIn, "(STUBBED) called");
-    int result = audio->AudioInOpen(type, len, freq, param);
+    return ORBIS_OK;
-    if (result < 0) {
-        LOG_ERROR(Lib_AudioIn, "Error returned  {:#x}", result);
-    }
-    return result;
 }
 
 int PS4_SYSV_ABI sceAudioInHqOpenEx() {
@@ -115,8 +108,9 @@ int PS4_SYSV_ABI sceAudioInInit() {
     return ORBIS_OK;
 }
 
-int PS4_SYSV_ABI sceAudioInInput(s32 handle, void* dest) {
+int PS4_SYSV_ABI sceAudioInInput() {
-    return audio->AudioInInput(handle, dest);
+    LOG_ERROR(Lib_AudioIn, "(STUBBED) called");
+    return ORBIS_OK;
 }
 
 int PS4_SYSV_ABI sceAudioInInputs() {
@@ -129,13 +123,9 @@ int PS4_SYSV_ABI sceAudioInIsSharedDevice() {
     return ORBIS_OK;
 }
 
-int PS4_SYSV_ABI sceAudioInOpen(Libraries::UserService::OrbisUserServiceUserId userId, u32 type,
+int PS4_SYSV_ABI sceAudioInOpen() {
-                                u32 index, u32 len, u32 freq, u32 param) {
+    LOG_ERROR(Lib_AudioIn, "(DUMMY) called");
-    int result = audio->AudioInOpen(type, len, freq, param);
+    return 0x80260005; // ports are full return
-    if (result < 0) {
-        LOG_ERROR(Lib_AudioIn, "Error returned  {:#x}", result);
-    }
-    return result;
 }
 
 int PS4_SYSV_ABI sceAudioInOpenEx() {
@@ -228,7 +218,7 @@ int PS4_SYSV_ABI sceAudioInVmicWrite() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceAudioIn(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("IQtWgnrw6v8", "libSceAudioIn", 1, "libSceAudioIn", 1, 1,
                  sceAudioInChangeAppModuleState);
     LIB_FUNCTION("Jh6WbHhnI68", "libSceAudioIn", 1, "libSceAudioIn", 1, 1, sceAudioInClose);

src/core/libraries/audio/audioin.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <core/libraries/system/userservice.h>
 #include "common/types.h"
 
 namespace Core::Loader {
@@ -12,12 +11,8 @@ class SymbolsResolver;
 
 namespace Libraries::AudioIn {
 
-enum class OrbisAudioInParamFormat : u32 { S16Mono = 0, S16Stereo = 2 };
-
-enum class OrbisAudioInType : u32 { VoiceChat = 0, General = 1, VoiceRecognition = 5 };
-
 int PS4_SYSV_ABI sceAudioInChangeAppModuleState();
-int PS4_SYSV_ABI sceAudioInClose(s32 handle);
+int PS4_SYSV_ABI sceAudioInClose();
 int PS4_SYSV_ABI sceAudioInCountPorts();
 int PS4_SYSV_ABI sceAudioInDeviceHqOpen();
 int PS4_SYSV_ABI sceAudioInDeviceIdHqOpen();
@@ -33,15 +28,13 @@ int PS4_SYSV_ABI sceAudioInGetGain();
 int PS4_SYSV_ABI sceAudioInGetHandleStatusInfo();
 int PS4_SYSV_ABI sceAudioInGetRerouteCount();
 int PS4_SYSV_ABI sceAudioInGetSilentState();
-int PS4_SYSV_ABI sceAudioInHqOpen(Libraries::UserService::OrbisUserServiceUserId userId, u32 type,
+int PS4_SYSV_ABI sceAudioInHqOpen();
-                                  u32 index, u32 len, u32 freq, u32 param);
 int PS4_SYSV_ABI sceAudioInHqOpenEx();
 int PS4_SYSV_ABI sceAudioInInit();
-int PS4_SYSV_ABI sceAudioInInput(s32 handle, void* dest);
+int PS4_SYSV_ABI sceAudioInInput();
 int PS4_SYSV_ABI sceAudioInInputs();
 int PS4_SYSV_ABI sceAudioInIsSharedDevice();
-int PS4_SYSV_ABI sceAudioInOpen(Libraries::UserService::OrbisUserServiceUserId userId, u32 type,
+int PS4_SYSV_ABI sceAudioInOpen();
-                                u32 index, u32 len, u32 freq, u32 param);
 int PS4_SYSV_ABI sceAudioInOpenEx();
 int PS4_SYSV_ABI sceAudioInSetAllMute();
 int PS4_SYSV_ABI sceAudioInSetCompressorPreGain();
@@ -61,5 +54,5 @@ int PS4_SYSV_ABI sceAudioInVmicCreate();
 int PS4_SYSV_ABI sceAudioInVmicDestroy();
 int PS4_SYSV_ABI sceAudioInVmicWrite();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceAudioIn(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::AudioIn

src/core/libraries/audio/audioout.cpp

@@ -14,7 +14,6 @@
 #include "core/libraries/audio/audioout.h"
 #include "core/libraries/audio/audioout_backend.h"
 #include "core/libraries/audio/audioout_error.h"
-#include "core/libraries/kernel/time.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::AudioOut {
@@ -169,19 +168,8 @@ int PS4_SYSV_ABI sceAudioOutGetInfoOpenNum() {
     return ORBIS_OK;
 }
 
-int PS4_SYSV_ABI sceAudioOutGetLastOutputTime(s32 handle, u64* output_time) {
+int PS4_SYSV_ABI sceAudioOutGetLastOutputTime() {
-    LOG_DEBUG(Lib_AudioOut, "called, handle: {}, output time: {}", handle, fmt::ptr(output_time));
+    LOG_ERROR(Lib_AudioOut, "(STUBBED) called");
-    if (!output_time) {
-        return ORBIS_AUDIO_OUT_ERROR_INVALID_POINTER;
-    }
-    if (handle >= ports_out.size()) {
-        return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
-    }
-    auto& port = ports_out.at(handle - 1);
-    if (!port.IsOpen()) {
-        return ORBIS_AUDIO_OUT_ERROR_NOT_OPENED;
-    }
-    *output_time = port.last_output_time;
     return ORBIS_OK;
 }
 
@@ -408,7 +396,6 @@ s32 PS4_SYSV_ABI sceAudioOutOutput(s32 handle, void* ptr) {
         if (ptr != nullptr && port.IsOpen()) {
             std::memcpy(port.output_buffer, ptr, port.BufferSize());
             port.output_ready = true;
-            port.last_output_time = Kernel::sceKernelGetProcessTime();
         }
     }
     port.output_cv.notify_one();
@@ -536,24 +523,9 @@ s32 PS4_SYSV_ABI sceAudioOutSetVolume(s32 handle, s32 flag, s32* vol) {
         }
         port.impl->SetVolume(port.volume);
     }
-    AdjustVol();
     return ORBIS_OK;
 }
 
-void AdjustVol() {
-    if (audio == nullptr) {
-        return;
-    }
-
-    for (int i = 0; i < ports_out.size(); i++) {
-        std::unique_lock lock{ports_out[i].mutex};
-        if (!ports_out[i].IsOpen()) {
-            continue;
-        }
-        ports_out[i].impl->SetVolume(ports_out[i].volume);
-    }
-}
-
 int PS4_SYSV_ABI sceAudioOutSetVolumeDown() {
     LOG_ERROR(Lib_AudioOut, "(STUBBED) called");
     return ORBIS_OK;
@@ -624,7 +596,7 @@ int PS4_SYSV_ABI sceAudioOutSetSystemDebugState() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceAudioOut(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("cx2dYFbzIAg", "libSceAudioOutDeviceService", 1, "libSceAudioOut", 1, 1,
                  sceAudioOutDeviceIdOpen);
     LIB_FUNCTION("tKumjQSzhys", "libSceAudioDeviceControl", 1, "libSceAudioOut", 1, 1,

src/core/libraries/audio/audioout.h

@@ -96,7 +96,6 @@ struct PortOut {
     AudioFormatInfo format_info;
     u32 sample_rate;
     u32 buffer_frames;
-    u64 last_output_time;
     std::array<s32, 8> volume;
 
     [[nodiscard]] bool IsOpen() const {
@@ -128,7 +127,7 @@ int PS4_SYSV_ABI sceAudioOutGetFocusEnablePid();
 int PS4_SYSV_ABI sceAudioOutGetHandleStatusInfo();
 int PS4_SYSV_ABI sceAudioOutGetInfo();
 int PS4_SYSV_ABI sceAudioOutGetInfoOpenNum();
-int PS4_SYSV_ABI sceAudioOutGetLastOutputTime(s32 handle, u64* output_time);
+int PS4_SYSV_ABI sceAudioOutGetLastOutputTime();
 int PS4_SYSV_ABI sceAudioOutGetPortState(s32 handle, OrbisAudioOutPortState* state);
 int PS4_SYSV_ABI sceAudioOutGetSimulatedBusUsableStatusByBusType();
 int PS4_SYSV_ABI sceAudioOutGetSimulatedHandleStatusInfo();
@@ -182,6 +181,5 @@ int PS4_SYSV_ABI sceAudioOutSystemControlSet();
 int PS4_SYSV_ABI sceAudioOutSparkControlSetEqCoef();
 int PS4_SYSV_ABI sceAudioOutSetSystemDebugState();
 
-void AdjustVol();
+void RegisterlibSceAudioOut(Core::Loader::SymbolsResolver* sym);
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::AudioOut

src/core/libraries/audio/sdl_audio.cpp

@@ -4,7 +4,6 @@
 #include <thread>
 #include <SDL3/SDL_audio.h>
 #include <SDL3/SDL_hints.h>
-#include <common/config.h>
 
 #include "common/logging/log.h"
 #include "core/libraries/audio/audioout.h"
@@ -42,7 +41,6 @@ public:
             stream = nullptr;
             return;
         }
-        SDL_SetAudioStreamGain(stream, Config::getVolumeSlider() / 100.0f);
     }
 
     ~SDLPortBackend() override {
@@ -79,8 +77,7 @@ public:
         }
         // SDL does not have per-channel volumes, for now just take the maximum of the channels.
         const auto vol = *std::ranges::max_element(ch_volumes);
-        if (!SDL_SetAudioStreamGain(stream, static_cast<float>(vol) / SCE_AUDIO_OUT_VOLUME_0DB *
+        if (!SDL_SetAudioStreamGain(stream, static_cast<float>(vol) / SCE_AUDIO_OUT_VOLUME_0DB)) {
-                                                Config::getVolumeSlider() / 100.0f)) {
             LOG_WARNING(Lib_AudioOut, "Failed to change SDL audio stream volume: {}",
                         SDL_GetError());
         }

src/core/libraries/audio/sdl_in.cpp

@@ -1,135 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <cstring>
-#include <common/config.h>
-#include <common/logging/log.h>
-#include "sdl_in.h"
-
-int SDLAudioIn::AudioInit() {
-    return SDL_InitSubSystem(SDL_INIT_AUDIO);
-}
-
-int SDLAudioIn::AudioInOpen(int type, uint32_t samples_num, uint32_t freq, uint32_t format) {
-    std::scoped_lock lock{m_mutex};
-
-    for (int id = 0; id < static_cast<int>(portsIn.size()); ++id) {
-        auto& port = portsIn[id];
-        if (!port.isOpen) {
-            port.isOpen = true;
-            port.type = type;
-            port.samples_num = samples_num;
-            port.freq = freq;
-            port.format = format;
-
-            SDL_AudioFormat sampleFormat;
-            switch (format) {
-            case Libraries::AudioIn::ORBIS_AUDIO_IN_PARAM_FORMAT_S16_MONO:
-                sampleFormat = SDL_AUDIO_S16;
-                port.channels_num = 1;
-                port.sample_size = 2;
-                break;
-            case Libraries::AudioIn::ORBIS_AUDIO_IN_PARAM_FORMAT_S16_STEREO:
-                sampleFormat = SDL_AUDIO_S16;
-                port.channels_num = 2;
-                port.sample_size = 2;
-                break;
-            default:
-                port.isOpen = false;
-                return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
-            }
-
-            SDL_AudioSpec fmt;
-            SDL_zero(fmt);
-            fmt.format = sampleFormat;
-            fmt.channels = port.channels_num;
-            fmt.freq = port.freq;
-
-            std::string micDevStr = Config::getMicDevice();
-            uint32_t devId;
-
-            if (micDevStr == "None") {
-                return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
-            } else if (micDevStr == "Default Device") {
-                devId = SDL_AUDIO_DEVICE_DEFAULT_RECORDING;
-            } else {
-                try {
-                    devId = static_cast<uint32_t>(std::stoul(micDevStr));
-                } catch (const std::exception& e) {
-                    return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
-                }
-            }
-
-            port.stream = SDL_OpenAudioDeviceStream(devId, &fmt, nullptr, nullptr);
-
-            if (!port.stream) {
-                port.isOpen = false;
-                return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
-            }
-
-            if (SDL_ResumeAudioStreamDevice(port.stream) == false) {
-                SDL_DestroyAudioStream(port.stream);
-                port = {};
-                return ORBIS_AUDIO_IN_ERROR_STREAM_FAIL;
-            }
-
-            return id + 1;
-        }
-    }
-
-    return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
-}
-
-int SDLAudioIn::AudioInInput(int handle, void* out_buffer) {
-    std::scoped_lock lock{m_mutex};
-
-    if (handle < 1 || handle > static_cast<int>(portsIn.size()) || !out_buffer)
-        return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
-
-    auto& port = portsIn[handle - 1];
-    if (!port.isOpen)
-        return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
-
-    const int bytesToRead = port.samples_num * port.sample_size * port.channels_num;
-
-    if (out_buffer == nullptr) {
-        int attempts = 0;
-        while (SDL_GetAudioStreamAvailable(port.stream) > 0) {
-            SDL_Delay(1);
-            if (++attempts > 1000) {
-                return ORBIS_AUDIO_IN_ERROR_TIMEOUT;
-            }
-        }
-        return 0; // done
-    }
-
-    int attempts = 0;
-    while (SDL_GetAudioStreamAvailable(port.stream) < bytesToRead) {
-        SDL_Delay(1);
-        if (++attempts > 1000) {
-            return ORBIS_AUDIO_IN_ERROR_TIMEOUT;
-        }
-    }
-
-    const int bytesRead = SDL_GetAudioStreamData(port.stream, out_buffer, bytesToRead);
-    if (bytesRead < 0) {
-        // SDL_GetAudioStreamData failed
-        LOG_ERROR(Lib_AudioIn, "AudioInInput error: {}", SDL_GetError());
-        return ORBIS_AUDIO_IN_ERROR_STREAM_FAIL;
-    }
-    const int framesRead = bytesRead / (port.sample_size * port.channels_num);
-    return framesRead;
-}
-
-void SDLAudioIn::AudioInClose(int handle) {
-    std::scoped_lock lock{m_mutex};
-    if (handle < 1 || handle > (int)portsIn.size())
-        return;
-
-    auto& port = portsIn[handle - 1];
-    if (!port.isOpen)
-        return;
-
-    SDL_DestroyAudioStream(port.stream);
-    port = {};
-}

src/core/libraries/audio/sdl_in.h

@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-#include <mutex>
-#include <SDL3/SDL.h>
-
-namespace Libraries::AudioIn {
-enum OrbisAudioInParam {
-    ORBIS_AUDIO_IN_PARAM_FORMAT_S16_MONO = 0,
-    ORBIS_AUDIO_IN_PARAM_FORMAT_S16_STEREO = 2
-};
-}
-
-#define ORBIS_AUDIO_IN_ERROR_INVALID_PORT -1
-#define ORBIS_AUDIO_IN_ERROR_TIMEOUT -2
-#define ORBIS_AUDIO_IN_ERROR_STREAM_FAIL -3
-
-class SDLAudioIn {
-public:
-    int AudioInit();
-    int AudioInOpen(int type, uint32_t samples_num, uint32_t freq, uint32_t format);
-    int AudioInInput(int handle, void* out_buffer);
-    void AudioInClose(int handle);
-
-private:
-    struct AudioInPort {
-        bool isOpen = false;
-        int type = 0;
-        uint32_t samples_num = 0;
-        uint32_t freq = 0;
-        int channels_num = 0;
-        int sample_size = 0;
-        uint32_t format = 0;
-        SDL_AudioStream* stream = nullptr;
-    };
-
-    std::array<AudioInPort, 8> portsIn;
-    std::mutex m_mutex;
-};

src/core/libraries/audio3d/audio3d.cpp

@@ -526,18 +526,11 @@ s32 PS4_SYSV_ABI sceAudio3dStrError() {
 }
 
 s32 PS4_SYSV_ABI sceAudio3dTerminate() {
-    LOG_INFO(Lib_Audio3d, "called");
+    LOG_ERROR(Lib_Audio3d, "(STUBBED) called");
-    if (!state) {
-        return ORBIS_AUDIO3D_ERROR_NOT_READY;
-    }
-
-    AudioOut::sceAudioOutOutput(state->audio_out_handle, nullptr);
-    AudioOut::sceAudioOutClose(state->audio_out_handle);
-    state.release();
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceAudio3d(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("pZlOm1aF3aA", "libSceAudio3d", 1, "libSceAudio3d", 1, 1, sceAudio3dAudioOutClose);
     LIB_FUNCTION("ucEsi62soTo", "libSceAudio3d", 1, "libSceAudio3d", 1, 1, sceAudio3dAudioOutOpen);
     LIB_FUNCTION("7NYEzJ9SJbM", "libSceAudio3d", 1, "libSceAudio3d", 1, 1,

src/core/libraries/audio3d/audio3d.h

@@ -141,5 +141,5 @@ s32 PS4_SYSV_ABI sceAudio3dSetGpuRenderer();
 s32 PS4_SYSV_ABI sceAudio3dStrError();
 s32 PS4_SYSV_ABI sceAudio3dTerminate();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceAudio3d(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::Audio3d

src/core/libraries/avplayer/avplayer.cpp

@@ -278,7 +278,7 @@ s32 PS4_SYSV_ABI sceAvPlayerVprintf(const char* format, va_list args) {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceAvPlayer(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("KMcEa+rHsIo", "libSceAvPlayer", 1, "libSceAvPlayer", 1, 0, sceAvPlayerAddSource);
     LIB_FUNCTION("x8uvuFOPZhU", "libSceAvPlayer", 1, "libSceAvPlayer", 1, 0,
                  sceAvPlayerAddSourceEx);

src/core/libraries/avplayer/avplayer.h

@@ -290,6 +290,6 @@ enum class SceAvPlayerAvSyncMode {
 
 using SceAvPlayerLogCallback = int PS4_SYSV_ABI (*)(void* p, const char* format, va_list args);
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceAvPlayer(Core::Loader::SymbolsResolver* sym);
 
 } // namespace Libraries::AvPlayer

src/core/libraries/avplayer/avplayer_source.h

@@ -40,7 +40,7 @@ public:
     FrameBuffer(const SceAvPlayerMemAllocator& memory_replacement, u32 align, u32 size) noexcept
         : m_memory_replacement(memory_replacement),
           m_data(Allocate(memory_replacement, align, size)) {
-        ASSERT_MSG(m_data, "Could not allocate frame buffer.");
+        ASSERT_MSG(m_data, "Could not allocated frame buffer.");
     }
 
     ~FrameBuffer() {

src/core/libraries/camera/camera.cpp

@@ -1,517 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/logging/log.h"
-#include "core/libraries/camera/camera.h"
-#include "core/libraries/camera/camera_error.h"
-#include "core/libraries/error_codes.h"
-#include "core/libraries/libs.h"
-
-namespace Libraries::Camera {
-
-s32 PS4_SYSV_ABI sceCameraAccGetData() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraAudioClose() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraAudioGetData() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraAudioGetData2() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraAudioOpen() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraAudioReset() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraChangeAppModuleState() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraClose(s32 handle) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraCloseByHandle() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraDeviceOpen() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetAttribute(s32 handle, OrbisCameraAttribute* pAttribute) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetAutoExposureGain(s32 handle, OrbisCameraChannel channel, u32* pEnable,
-                                              void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetAutoWhiteBalance(s32 handle, OrbisCameraChannel channel, u32* pEnable,
-                                              void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetCalibData() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetCalibDataFromDevice() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetCalibrationData() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetConfig(s32 handle, OrbisCameraConfig* pConfig) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetContrast(s32 handle, OrbisCameraChannel channel, u32* pContrast,
-                                      void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetDefectivePixelCancellation(s32 handle, OrbisCameraChannel channel,
-                                                        u32* pEnable, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetDeviceConfig() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetDeviceConfigWithoutHandle() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetDeviceID() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetDeviceIDWithoutOpen() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetDeviceInfo(s32 reserved, OrbisCameraDeviceInfo* pDeviceInfo) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetExposureGain(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraExposureGain* pExposureGain, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetFrameData(int handle, OrbisCameraFrameData* pFrameData) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetGamma(s32 handle, OrbisCameraChannel channel, OrbisCameraGamma* pGamma,
-                                   void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetHue(s32 handle, OrbisCameraChannel channel, s32* pHue, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetLensCorrection(s32 handle, OrbisCameraChannel channel, u32* pEnable,
-                                            void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetMmapConnectedCount() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetProductInfo() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetRegister() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetRegistryInfo() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetSaturation(s32 handle, OrbisCameraChannel channel, u32* pSaturation,
-                                        void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetSharpness(s32 handle, OrbisCameraChannel channel, u32* pSharpness,
-                                       void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetVrCaptureInfo() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraGetWhiteBalance(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraWhiteBalance* pWhiteBalance, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraInitializeRegistryCalibData() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraIsAttached(s32 index) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraIsConfigChangeDone() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraIsValidFrameData(int handle, OrbisCameraFrameData* pFrameData) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraOpen(Libraries::UserService::OrbisUserServiceUserId userId, s32 type,
-                               s32 index, OrbisCameraOpenParameter* pParam) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraOpenByModuleId() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraRemoveAppModuleFocus() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetAppModuleFocus() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetAttribute(s32 handle, OrbisCameraAttribute* pAttribute) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetAttributeInternal() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetAutoExposureGain(s32 handle, OrbisCameraChannel channel, u32 enable,
-                                              void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetAutoWhiteBalance(s32 handle, OrbisCameraChannel channel, u32 enable,
-                                              void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetCalibData() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetConfig(s32 handle, OrbisCameraConfig* pConfig) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetConfigInternal() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetContrast(s32 handle, OrbisCameraChannel channel, u32 contrast,
-                                      void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetDebugStop() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetDefectivePixelCancellation(s32 handle, OrbisCameraChannel channel,
-                                                        u32 enable, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetDefectivePixelCancellationInternal() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetExposureGain(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraExposureGain* pExposureGain, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetForceActivate() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetGamma(s32 handle, OrbisCameraChannel channel, OrbisCameraGamma* pGamma,
-                                   void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetHue(s32 handle, OrbisCameraChannel channel, s32 hue, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetLensCorrection(s32 handle, OrbisCameraChannel channel, u32 enable,
-                                            void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetLensCorrectionInternal() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetProcessFocus() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetProcessFocusByHandle() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetRegister() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetSaturation(s32 handle, OrbisCameraChannel channel, u32 saturation,
-                                        void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetSharpness(s32 handle, OrbisCameraChannel channel, u32 sharpness,
-                                       void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetTrackerMode() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetUacModeInternal() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetVideoSync(s32 handle, OrbisCameraVideoSyncParameter* pVideoSync) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetVideoSyncInternal() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraSetWhiteBalance(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraWhiteBalance* pWhiteBalance, void* pOption) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraStart(s32 handle, OrbisCameraStartParameter* pParam) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraStartByHandle() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraStop(s32 handle) {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCameraStopByHandle() {
-    LOG_ERROR(Lib_Camera, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
-    LIB_FUNCTION("QhjrPkRPUZQ", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAccGetData);
-    LIB_FUNCTION("UFonL7xopFM", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAudioClose);
-    LIB_FUNCTION("fkZE7Hup2ro", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAudioGetData);
-    LIB_FUNCTION("hftC5A1C8OQ", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAudioGetData2);
-    LIB_FUNCTION("DhqqFiBU+6g", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAudioOpen);
-    LIB_FUNCTION("wyU98EXAYxU", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAudioReset);
-    LIB_FUNCTION("Y0pCDajzkVQ", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraChangeAppModuleState);
-    LIB_FUNCTION("OMS9LlcrvBo", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraClose);
-    LIB_FUNCTION("ztqH5qNTpTk", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraCloseByHandle);
-    LIB_FUNCTION("nBH6i2s4Glc", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraDeviceOpen);
-    LIB_FUNCTION("0btIPD5hg5A", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetAttribute);
-    LIB_FUNCTION("oEi6vM-3E2c", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetAutoExposureGain);
-    LIB_FUNCTION("qTPRMh4eY60", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetAutoWhiteBalance);
-    LIB_FUNCTION("hHA1frlMxYE", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetCalibData);
-    LIB_FUNCTION("5Oie5RArfWs", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetCalibDataFromDevice);
-    LIB_FUNCTION("RHYJ7GKOSMg", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetCalibrationData);
-    LIB_FUNCTION("ZaqmGEtYuL0", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetConfig);
-    LIB_FUNCTION("a5xFueMZIMs", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetContrast);
-    LIB_FUNCTION("tslCukqFE+E", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetDefectivePixelCancellation);
-    LIB_FUNCTION("DSOLCrc3Kh8", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetDeviceConfig);
-    LIB_FUNCTION("n+rFeP1XXyM", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetDeviceConfigWithoutHandle);
-    LIB_FUNCTION("jTJCdyv9GLU", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetDeviceID);
-    LIB_FUNCTION("-H3UwGQvNZI", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetDeviceIDWithoutOpen);
-    LIB_FUNCTION("WZpxnSAM-ds", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetDeviceInfo);
-    LIB_FUNCTION("ObIste7hqdk", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetExposureGain);
-    LIB_FUNCTION("mxgMmR+1Kr0", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetFrameData);
-    LIB_FUNCTION("WVox2rwGuSc", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetGamma);
-    LIB_FUNCTION("zrIUDKZx0iE", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetHue);
-    LIB_FUNCTION("XqYRHc4aw3w", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetLensCorrection);
-    LIB_FUNCTION("B260o9pSzM8", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraGetMmapConnectedCount);
-    LIB_FUNCTION("ULxbwqiYYuU", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetProductInfo);
-    LIB_FUNCTION("olojYZKYiYs", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetRegister);
-    LIB_FUNCTION("hawKak+Auw4", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetRegistryInfo);
-    LIB_FUNCTION("RTDOsWWqdME", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetSaturation);
-    LIB_FUNCTION("c6Fp9M1EXXc", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetSharpness);
-    LIB_FUNCTION("IAz2HgZQWzE", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetVrCaptureInfo);
-    LIB_FUNCTION("HX5524E5tMY", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraGetWhiteBalance);
-    LIB_FUNCTION("0wnf2a60FqI", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraInitializeRegistryCalibData);
-    LIB_FUNCTION("p6n3Npi3YY4", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraIsAttached);
-    LIB_FUNCTION("wQfd7kfRZvo", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraIsConfigChangeDone);
-    LIB_FUNCTION("U3BVwQl2R5Q", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraIsValidFrameData);
-    LIB_FUNCTION("BHn83xrF92E", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraOpen);
-    LIB_FUNCTION("eTywOSWsEiI", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraOpenByModuleId);
-    LIB_FUNCTION("py8p6kZcHmA", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraRemoveAppModuleFocus);
-    LIB_FUNCTION("j5isFVIlZLk", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetAppModuleFocus);
-    LIB_FUNCTION("doPlf33ab-U", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetAttribute);
-    LIB_FUNCTION("96F7zp1Xo+k", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetAttributeInternal);
-    LIB_FUNCTION("yfSdswDaElo", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetAutoExposureGain);
-    LIB_FUNCTION("zIKL4kZleuc", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetAutoWhiteBalance);
-    LIB_FUNCTION("LEMk5cTHKEA", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetCalibData);
-    LIB_FUNCTION("VQ+5kAqsE2Q", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetConfig);
-    LIB_FUNCTION("9+SNhbctk64", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetConfigInternal);
-    LIB_FUNCTION("3i5MEzrC1pg", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetContrast);
-    LIB_FUNCTION("vejouEusC7g", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetDebugStop);
-    LIB_FUNCTION("jMv40y2A23g", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetDefectivePixelCancellation);
-    LIB_FUNCTION("vER3cIMBHqI", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetDefectivePixelCancellationInternal);
-    LIB_FUNCTION("wgBMXJJA6K4", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetExposureGain);
-    LIB_FUNCTION("jeTpU0MqKU0", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetForceActivate);
-    LIB_FUNCTION("lhEIsHzB8r4", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetGamma);
-    LIB_FUNCTION("QI8GVJUy2ZY", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetHue);
-    LIB_FUNCTION("K7W7H4ZRwbc", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetLensCorrection);
-    LIB_FUNCTION("eHa3vhGu2rQ", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetLensCorrectionInternal);
-    LIB_FUNCTION("lS0tM6n+Q5E", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetProcessFocus);
-    LIB_FUNCTION("NVITuK83Z7o", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetProcessFocusByHandle);
-    LIB_FUNCTION("8MjO05qk5hA", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetRegister);
-    LIB_FUNCTION("bSKEi2PzzXI", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetSaturation);
-    LIB_FUNCTION("P-7MVfzvpsM", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetSharpness);
-    LIB_FUNCTION("3VJOpzKoIeM", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetTrackerMode);
-    LIB_FUNCTION("nnR7KAIDPv8", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetUacModeInternal);
-    LIB_FUNCTION("wpeyFwJ+UEI", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetVideoSync);
-    LIB_FUNCTION("8WtmqmE4edw", "libSceCamera", 1, "libSceCamera", 1, 1,
-                 sceCameraSetVideoSyncInternal);
-    LIB_FUNCTION("k3zPIcgFNv0", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraSetWhiteBalance);
-    LIB_FUNCTION("9EpRYMy7rHU", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraStart);
-    LIB_FUNCTION("cLxF1QtHch0", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraStartByHandle);
-    LIB_FUNCTION("2G2C0nmd++M", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraStop);
-    LIB_FUNCTION("+X1Kgnn3bzg", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraStopByHandle);
-};
-
-} // namespace Libraries::Camera

src/core/libraries/camera/camera.h

@@ -1,308 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <core/libraries/system/userservice.h>
-#include "common/types.h"
-
-namespace Core::Loader {
-class SymbolsResolver;
-}
-
-namespace Libraries::Camera {
-
-constexpr int ORBIS_CAMERA_MAX_DEVICE_NUM = 2;
-constexpr int ORBIS_CAMERA_MAX_FORMAT_LEVEL_NUM = 4;
-
-enum OrbisCameraChannel {
-    ORBIS_CAMERA_CHANNEL_0 = 1,
-    ORBIS_CAMERA_CHANNEL_1 = 2,
-    ORBIS_CAMERA_CHANNEL_BOTH = 3,
-};
-
-struct OrbisCameraOpenParameter {
-    u32 sizeThis;
-    u32 reserved1;
-    u32 reserved2;
-    u32 reserved3;
-};
-
-enum OrbisCameraConfigType {
-    ORBIS_CAMERA_CONFIG_TYPE1 = 0x01,
-    ORBIS_CAMERA_CONFIG_TYPE2 = 0x02,
-    ORBIS_CAMERA_CONFIG_TYPE3 = 0x03,
-    ORBIS_CAMERA_CONFIG_TYPE4 = 0x04,
-    ORBIS_CAMERA_CONFIG_TYPE5 = 0x05,
-    ORBIS_CAMERA_CONFIG_EXTENTION = 0x10,
-};
-
-enum OrbisCameraResolution {
-    ORBIS_CAMERA_RESOLUTION_1280X800 = 0x0,
-    ORBIS_CAMERA_RESOLUTION_640X400 = 0x1,
-    ORBIS_CAMERA_RESOLUTION_320X200 = 0x2,
-    ORBIS_CAMERA_RESOLUTION_160X100 = 0x3,
-    ORBIS_CAMERA_RESOLUTION_320X192 = 0x4,
-    ORBIS_CAMERA_RESOLUTION_SPECIFIED_WIDTH_HEIGHT,
-    ORBIS_CAMERA_RESOLUTION_UNKNOWN = 0xFF,
-};
-
-enum OrbisCameraFramerate {
-    ORBIS_CAMERA_FRAMERATE_UNKNOWN = 0,
-    ORBIS_CAMERA_FRAMERATE_7_5 = 7,
-    ORBIS_CAMERA_FRAMERATE_15 = 15,
-    ORBIS_CAMERA_FRAMERATE_30 = 30,
-    ORBIS_CAMERA_FRAMERATE_60 = 60,
-    ORBIS_CAMERA_FRAMERATE_120 = 120,
-    ORBIS_CAMERA_FRAMERATE_240 = 240,
-};
-
-enum OrbisCameraBaseFormat {
-    ORBIS_CAMERA_FORMAT_YUV422 = 0x0,
-    ORBIS_CAMERA_FORMAT_RAW16,
-    ORBIS_CAMERA_FORMAT_RAW8,
-    ORBIS_CAMERA_FORMAT_NO_USE = 0x10,
-    ORBIS_CAMERA_FORMAT_UNKNOWN = 0xFF,
-};
-
-enum OrbisCameraScaleFormat {
-    ORBIS_CAMERA_SCALE_FORMAT_YUV422 = 0x0,
-    ORBIS_CAMERA_SCALE_FORMAT_Y16 = 0x3,
-    ORBIS_CAMERA_SCALE_FORMAT_Y8,
-    ORBIS_CAMERA_SCALE_FORMAT_NO_USE = 0x10,
-    ORBIS_CAMERA_SCALE_FORMAT_UNKNOWN = 0xFF,
-};
-
-struct OrbisCameraFormat {
-    OrbisCameraBaseFormat formatLevel0;
-    OrbisCameraScaleFormat formatLevel1;
-    OrbisCameraScaleFormat formatLevel2;
-    OrbisCameraScaleFormat formatLevel3;
-};
-
-struct OrbisCameraConfigExtention {
-    OrbisCameraFormat format;
-    OrbisCameraResolution resolution;
-    OrbisCameraFramerate framerate;
-    u32 width;
-    u32 height;
-    u32 reserved1;
-    void* pBaseOption;
-};
-
-struct OrbisCameraConfig {
-    u32 sizeThis;
-    OrbisCameraConfigType configType;
-    OrbisCameraConfigExtention configExtention[ORBIS_CAMERA_MAX_DEVICE_NUM];
-};
-
-enum OrbisCameraAecAgcTarget {
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_DEF = 0x00,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_2_0 = 0x20,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_1_6 = 0x16,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_1_4 = 0x14,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_1_2 = 0x12,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_1_0 = 0x10,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_0_8 = 0x08,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_0_6 = 0x06,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_0_4 = 0x04,
-    ORBIS_CAMERA_ATTRIBUTE_AECAGC_TARGET_0_2 = 0x02,
-};
-
-struct OrbisCameraDeviceInfo {
-    u32 sizeThis;
-    u32 infoRevision;
-    u32 deviceRevision;
-    u32 padding;
-};
-
-struct OrbisCameraStartParameter {
-    u32 sizeThis;
-    u32 formatLevel[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    void* pStartOption;
-};
-
-struct OrbisCameraVideoSyncParameter {
-    u32 sizeThis;
-    u32 videoSyncMode;
-    void* pModeOption;
-};
-
-struct OrbisCameraFramePosition {
-    u32 x;
-    u32 y;
-    u32 xSize;
-    u32 ySize;
-};
-
-struct OrbisCameraAutoExposureGainTarget {
-    u32 sizeThis;
-    OrbisCameraAecAgcTarget target;
-};
-
-struct OrbisCameraExposureGain {
-    u32 exposureControl;
-    u32 exposure;
-    u32 gain;
-    u32 mode;
-};
-
-struct OrbisCameraWhiteBalance {
-    u32 whiteBalanceControl;
-    u32 gainRed;
-    u32 gainBlue;
-    u32 gainGreen;
-};
-
-struct OrbisCameraGamma {
-    u32 gammaControl;
-    u32 value;
-    u8 reserved[16];
-};
-
-struct OrbisCameraMeta {
-    u32 metaMode;
-    u32 format[ORBIS_CAMERA_MAX_DEVICE_NUM][ORBIS_CAMERA_MAX_FORMAT_LEVEL_NUM];
-    u64 frame[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    u64 timestamp[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    u32 deviceTimestamp[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    OrbisCameraExposureGain exposureGain[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    OrbisCameraWhiteBalance whiteBalance[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    OrbisCameraGamma gamma[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    u32 luminance[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    float acceleration_x;
-    float acceleration_y;
-    float acceleration_z;
-    u64 vcounter;
-    u32 reserved[14];
-};
-
-struct OrbisCameraFrameData {
-    u32 sizeThis;
-    u32 readMode;
-    OrbisCameraFramePosition framePosition[ORBIS_CAMERA_MAX_DEVICE_NUM]
-                                          [ORBIS_CAMERA_MAX_FORMAT_LEVEL_NUM];
-    void* pFramePointerList[ORBIS_CAMERA_MAX_DEVICE_NUM][ORBIS_CAMERA_MAX_FORMAT_LEVEL_NUM];
-    u32 frameSize[ORBIS_CAMERA_MAX_DEVICE_NUM][ORBIS_CAMERA_MAX_FORMAT_LEVEL_NUM];
-    u32 status[ORBIS_CAMERA_MAX_DEVICE_NUM];
-    OrbisCameraMeta meta;
-    void* pFramePointerListGarlic[ORBIS_CAMERA_MAX_DEVICE_NUM][ORBIS_CAMERA_MAX_FORMAT_LEVEL_NUM];
-};
-
-struct OrbisCameraAttribute {
-    u32 sizeThis;
-    OrbisCameraChannel channel;
-    OrbisCameraFramePosition framePosition;
-    OrbisCameraExposureGain exposureGain;
-    OrbisCameraWhiteBalance whiteBalance;
-    OrbisCameraGamma gamma;
-    u32 saturation;
-    u32 contrast;
-    u32 sharpness;
-    s32 hue;
-    u32 reserved1;
-    u32 reserved2;
-    u32 reserved3;
-    u32 reserved4;
-};
-
-s32 PS4_SYSV_ABI sceCameraAccGetData();
-s32 PS4_SYSV_ABI sceCameraAudioClose();
-s32 PS4_SYSV_ABI sceCameraAudioGetData();
-s32 PS4_SYSV_ABI sceCameraAudioGetData2();
-s32 PS4_SYSV_ABI sceCameraAudioOpen();
-s32 PS4_SYSV_ABI sceCameraAudioReset();
-s32 PS4_SYSV_ABI sceCameraChangeAppModuleState();
-s32 PS4_SYSV_ABI sceCameraClose(s32 handle);
-s32 PS4_SYSV_ABI sceCameraCloseByHandle();
-s32 PS4_SYSV_ABI sceCameraDeviceOpen();
-s32 PS4_SYSV_ABI sceCameraGetAttribute(s32 handle, OrbisCameraAttribute* pAttribute);
-s32 PS4_SYSV_ABI sceCameraGetAutoExposureGain(s32 handle, OrbisCameraChannel channel, u32* pEnable,
-                                              void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetAutoWhiteBalance(s32 handle, OrbisCameraChannel channel, u32* pEnable,
-                                              void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetCalibData();
-s32 PS4_SYSV_ABI sceCameraGetCalibDataFromDevice();
-s32 PS4_SYSV_ABI sceCameraGetCalibrationData();
-s32 PS4_SYSV_ABI sceCameraGetConfig(s32 handle, OrbisCameraConfig* pConfig);
-s32 PS4_SYSV_ABI sceCameraGetContrast(s32 handle, OrbisCameraChannel channel, u32* pContrast,
-                                      void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetDefectivePixelCancellation(s32 handle, OrbisCameraChannel channel,
-                                                        u32* pEnable, void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetDeviceConfig();
-s32 PS4_SYSV_ABI sceCameraGetDeviceConfigWithoutHandle();
-s32 PS4_SYSV_ABI sceCameraGetDeviceID();
-s32 PS4_SYSV_ABI sceCameraGetDeviceIDWithoutOpen();
-s32 PS4_SYSV_ABI sceCameraGetDeviceInfo(s32 reserved, OrbisCameraDeviceInfo* pDeviceInfo);
-s32 PS4_SYSV_ABI sceCameraGetExposureGain(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraExposureGain* pExposureGain, void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetFrameData(int handle, OrbisCameraFrameData* pFrameData);
-s32 PS4_SYSV_ABI sceCameraGetGamma(s32 handle, OrbisCameraChannel channel, OrbisCameraGamma* pGamma,
-                                   void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetHue(s32 handle, OrbisCameraChannel channel, s32* pHue, void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetLensCorrection(s32 handle, OrbisCameraChannel channel, u32* pEnable,
-                                            void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetMmapConnectedCount();
-s32 PS4_SYSV_ABI sceCameraGetProductInfo();
-s32 PS4_SYSV_ABI sceCameraGetRegister();
-s32 PS4_SYSV_ABI sceCameraGetRegistryInfo();
-s32 PS4_SYSV_ABI sceCameraGetSaturation(s32 handle, OrbisCameraChannel channel, u32* pSaturation,
-                                        void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetSharpness(s32 handle, OrbisCameraChannel channel, u32* pSharpness,
-                                       void* pOption);
-s32 PS4_SYSV_ABI sceCameraGetVrCaptureInfo();
-s32 PS4_SYSV_ABI sceCameraGetWhiteBalance(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraWhiteBalance* pWhiteBalance, void* pOption);
-s32 PS4_SYSV_ABI sceCameraInitializeRegistryCalibData();
-s32 PS4_SYSV_ABI sceCameraIsAttached(s32 index);
-s32 PS4_SYSV_ABI sceCameraIsConfigChangeDone();
-s32 PS4_SYSV_ABI sceCameraIsValidFrameData(int handle, OrbisCameraFrameData* pFrameData);
-s32 PS4_SYSV_ABI sceCameraOpen(Libraries::UserService::OrbisUserServiceUserId userId, s32 type,
-                               s32 index, OrbisCameraOpenParameter* pParam);
-s32 PS4_SYSV_ABI sceCameraOpenByModuleId();
-s32 PS4_SYSV_ABI sceCameraRemoveAppModuleFocus();
-s32 PS4_SYSV_ABI sceCameraSetAppModuleFocus();
-s32 PS4_SYSV_ABI sceCameraSetAttribute(s32 handle, OrbisCameraAttribute* pAttribute);
-s32 PS4_SYSV_ABI sceCameraSetAttributeInternal();
-s32 PS4_SYSV_ABI sceCameraSetAutoExposureGain(s32 handle, OrbisCameraChannel channel, u32 enable,
-                                              void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetAutoWhiteBalance(s32 handle, OrbisCameraChannel channel, u32 enable,
-                                              void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetCalibData();
-s32 PS4_SYSV_ABI sceCameraSetConfig(s32 handle, OrbisCameraConfig* pConfig);
-s32 PS4_SYSV_ABI sceCameraSetConfigInternal();
-s32 PS4_SYSV_ABI sceCameraSetContrast(s32 handle, OrbisCameraChannel channel, u32 contrast,
-                                      void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetDebugStop();
-s32 PS4_SYSV_ABI sceCameraSetDefectivePixelCancellation(s32 handle, OrbisCameraChannel channel,
-                                                        u32 enable, void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetDefectivePixelCancellationInternal();
-s32 PS4_SYSV_ABI sceCameraSetExposureGain(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraExposureGain* pExposureGain, void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetForceActivate();
-s32 PS4_SYSV_ABI sceCameraSetGamma(s32 handle, OrbisCameraChannel channel, OrbisCameraGamma* pGamma,
-                                   void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetHue(s32 handle, OrbisCameraChannel channel, s32 hue, void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetLensCorrection(s32 handle, OrbisCameraChannel channel, u32 enable,
-                                            void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetLensCorrectionInternal();
-s32 PS4_SYSV_ABI sceCameraSetProcessFocus();
-s32 PS4_SYSV_ABI sceCameraSetProcessFocusByHandle();
-s32 PS4_SYSV_ABI sceCameraSetRegister();
-s32 PS4_SYSV_ABI sceCameraSetSaturation(s32 handle, OrbisCameraChannel channel, u32 saturation,
-                                        void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetSharpness(s32 handle, OrbisCameraChannel channel, u32 sharpness,
-                                       void* pOption);
-s32 PS4_SYSV_ABI sceCameraSetTrackerMode();
-s32 PS4_SYSV_ABI sceCameraSetUacModeInternal();
-s32 PS4_SYSV_ABI sceCameraSetVideoSync(s32 handle, OrbisCameraVideoSyncParameter* pVideoSync);
-s32 PS4_SYSV_ABI sceCameraSetVideoSyncInternal();
-s32 PS4_SYSV_ABI sceCameraSetWhiteBalance(s32 handle, OrbisCameraChannel channel,
-                                          OrbisCameraWhiteBalance* pWhiteBalance, void* pOption);
-s32 PS4_SYSV_ABI sceCameraStart(s32 handle, OrbisCameraStartParameter* pParam);
-s32 PS4_SYSV_ABI sceCameraStartByHandle();
-s32 PS4_SYSV_ABI sceCameraStop(s32 handle);
-s32 PS4_SYSV_ABI sceCameraStopByHandle();
-
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
-} // namespace Libraries::Camera

src/core/libraries/camera/camera_error.h

@@ -1,29 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-constexpr int ORBIS_CAMERA_ERROR_PARAM = 0x802E0000;
-constexpr int ORBIS_CAMERA_ERROR_ALREADY_INIT = 0x802E0001;
-constexpr int ORBIS_CAMERA_ERROR_NOT_INIT = 0x802E0002;
-constexpr int ORBIS_CAMERA_ERROR_ALREADY_OPEN = 0x802E0003;
-constexpr int ORBIS_CAMERA_ERROR_NOT_OPEN = 0x802E0004;
-constexpr int ORBIS_CAMERA_ERROR_ALREADY_START = 0x802E0005;
-constexpr int ORBIS_CAMERA_ERROR_NOT_START = 0x802E0006;
-constexpr int ORBIS_CAMERA_ERROR_FORMAT_UNKNOWN = 0x802E0007;
-constexpr int ORBIS_CAMERA_ERROR_RESOLUTION_UNKNOWN = 0x802E0008;
-constexpr int ORBIS_CAMERA_ERROR_BAD_FRAMERATE = 0x802E0009;
-constexpr int ORBIS_CAMERA_ERROR_TIMEOUT = 0x802E000A;
-constexpr int ORBIS_CAMERA_ERROR_ATTRIBUTE_UNKNOWN = 0x802E000B;
-constexpr int ORBIS_CAMERA_ERROR_BUSY = 0x802E000C;
-constexpr int ORBIS_CAMERA_ERROR_UNKNOWN_CONFIG = 0x802E000D;
-constexpr int ORBIS_CAMERA_ERROR_ALREADY_READ = 0x802E000F;
-constexpr int ORBIS_CAMERA_ERROR_NOT_CONNECTED = 0x802E0010;
-constexpr int ORBIS_CAMERA_ERROR_NOT_SUPPORTED = 0x802E0011;
-constexpr int ORBIS_CAMERA_ERROR_INVALID_CONFIG = 0x802E0013;
-constexpr int ORBIS_CAMERA_ERROR_MAX_HANDLE = 0x802E0014;
-constexpr int ORBIS_CAMERA_ERROR_MAX_PROCESS = 0x802E00FB;
-constexpr int ORBIS_CAMERA_ERROR_COPYOUT_FAILED = 0x802E00FC;
-constexpr int ORBIS_CAMERA_ERROR_COPYIN_FAILED = 0x802E00FD;
-constexpr int ORBIS_CAMERA_ERROR_KPROC_CREATE = 0x802E00FE;
-constexpr int ORBIS_CAMERA_ERROR_FATAL = 0x802E00FF;

src/core/libraries/companion/companion_error.h

@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/types.h"
-
-// companion_httpd error codes
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_UNKNOWN = 0x80E40001;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_FATAL = 0x80E40002;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_NOMEM = 0x80E40003;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_INVALID_PARAM = 0x80E40004;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_INVALID_OPERATION = 0x80E40005;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_NOT_INITIALIZED = 0x80E40006;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_ALREADY_INITIALIZED = 0x80E40007;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_NO_EVENT = 0x80E40008;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_NOT_GENERATE_RESPONSE = 0x80E40009;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_ALREADY_STARTED = 0x80E4000A;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_NOT_STARTED = 0x80E4000B;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_ALREADY_REGISTERED = 0x80E4000;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_NOT_CONNECTED = 0x80E4000D;
-constexpr int ORBIS_COMPANION_HTTPD_ERROR_USER_NOT_FOUND = 0x80E4000E;
-
-// companion_util error codes
-constexpr u32 ORBIS_COMPANION_UTIL_INVALID_ARGUMENT = 0x80AD0004;
-constexpr u32 ORBIS_COMPANION_UTIL_INVALID_POINTER = 0x80AD0006;
-constexpr u32 ORBIS_COMPANION_UTIL_NO_EVENT = 0x80AD0008;

src/core/libraries/companion/companion_httpd.cpp

@@ -1,142 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/logging/log.h"
-#include "companion_error.h"
-#include "core/libraries/companion/companion_httpd.h"
-#include "core/libraries/error_codes.h"
-#include "core/libraries/libs.h"
-
-namespace Libraries::CompanionHttpd {
-
-s32 PS4_SYSV_ABI sceCompanionHttpdAddHeader(const char* key, const char* value,
-                                            OrbisCompanionHttpdResponse* response) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI
-sceCompanionHttpdGet2ndScreenStatus(Libraries::UserService::OrbisUserServiceUserId) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdGetEvent(OrbisCompanionHttpdEvent* pEvent) {
-    pEvent->event = ORBIS_COMPANION_HTTPD_EVENT_DISCONNECT; // disconnected
-    LOG_DEBUG(Lib_CompanionHttpd, "device disconnected");
-    return ORBIS_COMPANION_HTTPD_ERROR_NO_EVENT; // No events to obtain
-}
-
-s32 PS4_SYSV_ABI
-sceCompanionHttpdGetUserId(u32 addr, Libraries::UserService::OrbisUserServiceUserId* userId) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdInitialize() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdInitialize2() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdOptParamInitialize() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdRegisterRequestBodyReceptionCallback(
-    OrbisCompanionHttpdRequestBodyReceptionCallback function, void* param) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI
-sceCompanionHttpdRegisterRequestCallback(OrbisCompanionHttpdRequestCallback function, void* param) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdRegisterRequestCallback2(
-    OrbisCompanionHttpdRequestCallback function, void* param) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdSetBody(const char* body, u64 bodySize,
-                                          OrbisCompanionHttpdResponse* response) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdSetStatus(s32 status, OrbisCompanionHttpdResponse* response) {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdStart() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdStop() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdTerminate() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdUnregisterRequestBodyReceptionCallback() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionHttpdUnregisterRequestCallback() {
-    LOG_ERROR(Lib_CompanionHttpd, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
-    LIB_FUNCTION("8pWltDG7h6A", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdAddHeader);
-    LIB_FUNCTION("B-QBMeFdNgY", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdGet2ndScreenStatus);
-    LIB_FUNCTION("Vku4big+IYM", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdGetEvent);
-    LIB_FUNCTION("0SySxcuVNG0", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdGetUserId);
-    LIB_FUNCTION("ykNpWs3ktLY", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdInitialize);
-    LIB_FUNCTION("OA6FbORefbo", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdInitialize2);
-    LIB_FUNCTION("r-2-a0c7Kfc", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdOptParamInitialize);
-    LIB_FUNCTION("fHNmij7kAUM", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdRegisterRequestBodyReceptionCallback);
-    LIB_FUNCTION("OaWw+IVEdbI", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdRegisterRequestCallback);
-    LIB_FUNCTION("-0c9TCTwnGs", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdRegisterRequestCallback2);
-    LIB_FUNCTION("h3OvVxzX4qM", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdSetBody);
-    LIB_FUNCTION("w7oz0AWHpT4", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdSetStatus);
-    LIB_FUNCTION("k7F0FcDM-Xc", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdStart);
-    LIB_FUNCTION("0SCgzfVQHpo", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdStop);
-    LIB_FUNCTION("+-du9tWgE9s", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdTerminate);
-    LIB_FUNCTION("ZSHiUfYK+QI", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdUnregisterRequestBodyReceptionCallback);
-    LIB_FUNCTION("xweOi2QT-BE", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1,
-                 sceCompanionHttpdUnregisterRequestCallback);
-};
-
-} // namespace Libraries::CompanionHttpd

src/core/libraries/companion/companion_httpd.h

@@ -1,91 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/types.h"
-#include "core/libraries/network/net.h"
-#include "core/libraries/system/userservice.h"
-
-namespace Core::Loader {
-class SymbolsResolver;
-}
-
-namespace Libraries::CompanionHttpd {
-
-// OrbisCompanionHttpdEvent event codes
-constexpr int ORBIS_COMPANION_HTTPD_EVENT_CONNECT = 0x10000001;
-constexpr int ORBIS_COMPANION_HTTPD_EVENT_DISCONNECT = 0x10000002;
-
-struct OrbisCompanionHttpdHeader {
-    char* key;
-    char* value;
-    struct OrbisCompanionHttpdHeader* header;
-};
-
-struct OrbisCompanionHttpdRequest {
-    s32 method;
-    char* url;
-    OrbisCompanionHttpdHeader* header;
-    char* body;
-    u64 bodySize;
-};
-
-struct OrbisCompanionHttpdResponse {
-    s32 status;
-    OrbisCompanionHttpdHeader* header;
-    char* body;
-    u64 bodySize;
-};
-
-using OrbisCompanionHttpdRequestBodyReceptionCallback =
-    PS4_SYSV_ABI s32 (*)(s32 event, Libraries::UserService::OrbisUserServiceUserId userId,
-                         const OrbisCompanionHttpdRequest* httpRequest, void* param);
-
-using OrbisCompanionHttpdRequestCallback =
-    PS4_SYSV_ABI s32 (*)(Libraries::UserService::OrbisUserServiceUserId userId,
-                         const OrbisCompanionHttpdRequest* httpRequest,
-                         OrbisCompanionHttpdResponse* httpResponse, void* param);
-
-struct OrbisCompanionUtilDeviceInfo {
-    Libraries::UserService::OrbisUserServiceUserId userId;
-    Libraries::Net::OrbisNetSockaddrIn addr;
-    char reserved[236];
-};
-
-struct OrbisCompanionHttpdEvent {
-    s32 event;
-    union {
-        OrbisCompanionUtilDeviceInfo deviceInfo;
-        Libraries::UserService::OrbisUserServiceUserId userId;
-        char reserved[256];
-    } data;
-};
-
-s32 PS4_SYSV_ABI sceCompanionHttpdAddHeader(const char* key, const char* value,
-                                            OrbisCompanionHttpdResponse* response);
-s32 PS4_SYSV_ABI
-sceCompanionHttpdGet2ndScreenStatus(Libraries::UserService::OrbisUserServiceUserId userId);
-s32 PS4_SYSV_ABI sceCompanionHttpdGetEvent(OrbisCompanionHttpdEvent* pEvent);
-s32 PS4_SYSV_ABI sceCompanionHttpdGetUserId(u32 addr,
-                                            Libraries::UserService::OrbisUserServiceUserId* userId);
-s32 PS4_SYSV_ABI sceCompanionHttpdInitialize();
-s32 PS4_SYSV_ABI sceCompanionHttpdInitialize2();
-s32 PS4_SYSV_ABI sceCompanionHttpdOptParamInitialize();
-s32 PS4_SYSV_ABI sceCompanionHttpdRegisterRequestBodyReceptionCallback(
-    OrbisCompanionHttpdRequestBodyReceptionCallback function, void* param);
-s32 PS4_SYSV_ABI
-sceCompanionHttpdRegisterRequestCallback(OrbisCompanionHttpdRequestCallback function, void* param);
-s32 PS4_SYSV_ABI
-sceCompanionHttpdRegisterRequestCallback2(OrbisCompanionHttpdRequestCallback function, void* param);
-s32 PS4_SYSV_ABI sceCompanionHttpdSetBody(const char* body, u64 bodySize,
-                                          OrbisCompanionHttpdResponse* response);
-s32 PS4_SYSV_ABI sceCompanionHttpdSetStatus(s32 status, OrbisCompanionHttpdResponse* response);
-s32 PS4_SYSV_ABI sceCompanionHttpdStart();
-s32 PS4_SYSV_ABI sceCompanionHttpdStop();
-s32 PS4_SYSV_ABI sceCompanionHttpdTerminate();
-s32 PS4_SYSV_ABI sceCompanionHttpdUnregisterRequestBodyReceptionCallback();
-s32 PS4_SYSV_ABI sceCompanionHttpdUnregisterRequestCallback();
-
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
-} // namespace Libraries::CompanionHttpd

src/core/libraries/companion/companion_util.cpp

@@ -1,72 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/logging/log.h"
-#include "companion_error.h"
-#include "core/libraries/companion/companion_util.h"
-#include "core/libraries/error_codes.h"
-#include "core/libraries/libs.h"
-
-namespace Libraries::CompanionUtil {
-
-u32 PS4_SYSV_ABI getEvent(sceCompanionUtilContext* ctx, sceCompanionUtilEvent* outEvent,
-                          s32 param_3) {
-    if (outEvent == 0) {
-        return ORBIS_COMPANION_UTIL_INVALID_ARGUMENT;
-    }
-
-    if (ctx == nullptr) {
-        return ORBIS_COMPANION_UTIL_INVALID_POINTER;
-    }
-
-    uint8_t* base = ctx->blob;
-    int flag = *reinterpret_cast<int*>(base + 0x178);
-    if (flag == 0) {
-        return ORBIS_COMPANION_UTIL_NO_EVENT;
-    }
-
-    return ORBIS_COMPANION_UTIL_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionUtilGetEvent(sceCompanionUtilEvent* outEvent) {
-    sceCompanionUtilContext* ctx = nullptr;
-    u32 ret = getEvent(ctx, outEvent, 1);
-
-    LOG_DEBUG(Lib_CompanionUtil, "(STUBBED) called ret: {}", ret);
-    return ret;
-}
-
-s32 PS4_SYSV_ABI sceCompanionUtilGetRemoteOskEvent() {
-    LOG_ERROR(Lib_CompanionUtil, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionUtilInitialize() {
-    LOG_ERROR(Lib_CompanionUtil, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionUtilOptParamInitialize() {
-    LOG_ERROR(Lib_CompanionUtil, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-s32 PS4_SYSV_ABI sceCompanionUtilTerminate() {
-    LOG_ERROR(Lib_CompanionUtil, "(STUBBED) called");
-    return ORBIS_OK;
-}
-
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
-    LIB_FUNCTION("cE5Msy11WhU", "libSceCompanionUtil", 1, "libSceCompanionUtil", 1, 1,
-                 sceCompanionUtilGetEvent);
-    LIB_FUNCTION("MaVrz79mT5o", "libSceCompanionUtil", 1, "libSceCompanionUtil", 1, 1,
-                 sceCompanionUtilGetRemoteOskEvent);
-    LIB_FUNCTION("xb1xlIhf0QY", "libSceCompanionUtil", 1, "libSceCompanionUtil", 1, 1,
-                 sceCompanionUtilInitialize);
-    LIB_FUNCTION("IPN-FRSrafk", "libSceCompanionUtil", 1, "libSceCompanionUtil", 1, 1,
-                 sceCompanionUtilOptParamInitialize);
-    LIB_FUNCTION("H1fYQd5lFAI", "libSceCompanionUtil", 1, "libSceCompanionUtil", 1, 1,
-                 sceCompanionUtilTerminate);
-};
-
-} // namespace Libraries::CompanionUtil

src/core/libraries/companion/companion_util.h

@@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/types.h"
-
-namespace Core::Loader {
-class SymbolsResolver;
-}
-
-namespace Libraries::CompanionUtil {
-
-constexpr u32 ORBIS_COMPANION_UTIL_OK = 0;
-
-struct sceCompanionUtilEvent {
-    std::uint8_t blob[0x104]{}; /// 0x104 bytes of data, dont know what it is exactly
-};
-
-struct sceCompanionUtilContext {
-    std::uint8_t blob[0x27B]{}; /// 0x27B bytes of data, dont know what it is exactly
-};
-
-u32 PS4_SYSV_ABI getEvent(sceCompanionUtilContext* ctx, sceCompanionUtilEvent* outEvent,
-                          s32 param_3);
-s32 PS4_SYSV_ABI sceCompanionUtilGetEvent(sceCompanionUtilEvent* outEvent);
-s32 PS4_SYSV_ABI sceCompanionUtilGetRemoteOskEvent();
-s32 PS4_SYSV_ABI sceCompanionUtilInitialize();
-s32 PS4_SYSV_ABI sceCompanionUtilOptParamInitialize();
-s32 PS4_SYSV_ABI sceCompanionUtilTerminate();
-
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
-} // namespace Libraries::CompanionUtil

src/core/libraries/disc_map/disc_map.cpp

@@ -34,7 +34,7 @@ int PS4_SYSV_ABI Func_E7EBCE96E92F91F8() {
     return ORBIS_DISC_MAP_ERROR_NO_BITMAP_INFO;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceDiscMap(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("fl1eoDnwQ4s", "libSceDiscMap", 1, "libSceDiscMap", 1, 1,
                  sceDiscMapGetPackageSize);
     LIB_FUNCTION("lbQKqsERhtE", "libSceDiscMap", 1, "libSceDiscMap", 1, 1,

src/core/libraries/disc_map/disc_map.h

@@ -18,5 +18,5 @@ int PS4_SYSV_ABI Func_8A828CAEE7EDD5E9(char* path, s64 offset, s64 nbytes, int*
                                        int* ret2);
 int PS4_SYSV_ABI Func_E7EBCE96E92F91F8();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceDiscMap(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::DiscMap

src/core/libraries/fiber/fiber.cpp

@@ -545,7 +545,7 @@ s32 PS4_SYSV_ABI sceFiberSwitch(OrbisFiber* fiber, u64 arg_on_run_to, u64* arg_o
     return sceFiberSwitchImpl(fiber, nullptr, 0, arg_on_run_to, arg_on_run);
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceFiber(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("hVYD7Ou2pCQ", "libSceFiber", 1, "libSceFiber", 1, 1, sceFiberInitialize);
     LIB_FUNCTION("7+OJIpko9RY", "libSceFiber", 1, "libSceFiber", 1, 1,
                  sceFiberInitializeImpl); // _sceFiberInitializeWithInternalOptionImpl

src/core/libraries/fiber/fiber.h

@@ -116,5 +116,5 @@ s32 PS4_SYSV_ABI sceFiberRename(OrbisFiber* fiber, const char* name);
 
 s32 PS4_SYSV_ABI sceFiberGetThreadFramePointerAddress(u64* addr_frame_pointer);
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceFiber(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::Fiber

src/core/libraries/game_live_streaming/gamelivestreaming.cpp

@@ -246,7 +246,7 @@ int PS4_SYSV_ABI sceGameLiveStreamingUnregisterCallback() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceGameLiveStreaming(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("caqgDl+V9qA", "libSceGameLiveStreaming_debug", 1, "libSceGameLiveStreaming", 1, 1,
                  sceGameLiveStreamingStartDebugBroadcast);
     LIB_FUNCTION("0i8Lrllxwow", "libSceGameLiveStreaming_debug", 1, "libSceGameLiveStreaming", 1, 1,

src/core/libraries/game_live_streaming/gamelivestreaming.h

@@ -77,5 +77,5 @@ int PS4_SYSV_ABI sceGameLiveStreamingStopSocialFeedbackMessageFiltering();
 int PS4_SYSV_ABI sceGameLiveStreamingTerminate();
 int PS4_SYSV_ABI sceGameLiveStreamingUnregisterCallback();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceGameLiveStreaming(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::GameLiveStreaming

src/core/libraries/gnmdriver/gnmdriver.cpp

@@ -179,7 +179,7 @@ s32 PS4_SYSV_ABI sceGnmComputeWaitOnAddress(u32* cmdbuf, u32 size, uintptr_t add
         auto* wait_reg_mem = reinterpret_cast<PM4CmdWaitRegMem*>(cmdbuf);
         wait_reg_mem->header = PM4Type3Header{PM4ItOpcode::WaitRegMem, 5};
         wait_reg_mem->raw = (is_mem << 4u) | (cmp_func & 7u);
-        wait_reg_mem->poll_addr_lo_raw = u32(addr & addr_mask);
+        wait_reg_mem->poll_addr_lo = u32(addr & addr_mask);
         wait_reg_mem->poll_addr_hi = u32(addr >> 32u);
         wait_reg_mem->ref = ref;
         wait_reg_mem->mask = mask;
@@ -505,10 +505,9 @@ s32 PS4_SYSV_ABI sceGnmDrawIndexIndirectCountMulti(u32* cmdbuf, u32 size, u32 da
                                                    u32 flags) {
     LOG_TRACE(Lib_GnmDriver, "called");
 
-    if ((!sceKernelIsNeoMode() || !UseNeoCompatSequences) && cmdbuf && (size == 16) &&
+    if ((!sceKernelIsNeoMode() || !UseNeoCompatSequences) && !cmdbuf && (size == 16) &&
-        (vertex_sgpr_offset < 0x10u) && (instance_sgpr_offset < 0x10u) &&
+        (shader_stage < ShaderStages::Max) && (vertex_sgpr_offset < 0x10u) &&
-        (shader_stage == ShaderStages::Vs || shader_stage == ShaderStages::Es ||
+        (instance_sgpr_offset < 0x10u)) {
-         shader_stage == ShaderStages::Ls)) {
 
         cmdbuf = WriteHeader<PM4ItOpcode::Nop>(cmdbuf, 2);
         cmdbuf = WriteBody(cmdbuf, 0u);
@@ -536,33 +535,10 @@ s32 PS4_SYSV_ABI sceGnmDrawIndexIndirectCountMulti(u32* cmdbuf, u32 size, u32 da
     return -1;
 }
 
-int PS4_SYSV_ABI sceGnmDrawIndexIndirectMulti(u32* cmdbuf, u32 size, u32 data_offset, u32 max_count,
+int PS4_SYSV_ABI sceGnmDrawIndexIndirectMulti() {
-                                              u32 shader_stage, u32 vertex_sgpr_offset,
+    LOG_ERROR(Lib_GnmDriver, "(STUBBED) called");
-                                              u32 instance_sgpr_offset, u32 flags) {
+    UNREACHABLE();
-    LOG_TRACE(Lib_GnmDriver, "called");
+    return ORBIS_OK;
-
-    if (cmdbuf && (size == 11) && (vertex_sgpr_offset < 0x10u) && (instance_sgpr_offset < 0x10u) &&
-        (shader_stage == ShaderStages::Vs || shader_stage == ShaderStages::Es ||
-         shader_stage == ShaderStages::Ls)) {
-
-        const auto predicate = flags & 1 ? PM4Predicate::PredEnable : PM4Predicate::PredDisable;
-        cmdbuf = WriteHeader<PM4ItOpcode::DrawIndexIndirectMulti>(
-            cmdbuf, 6, PM4ShaderType::ShaderGraphics, predicate);
-
-        const auto sgpr_offset = indirect_sgpr_offsets[shader_stage];
-
-        cmdbuf[0] = data_offset;
-        cmdbuf[1] = vertex_sgpr_offset == 0 ? 0 : (vertex_sgpr_offset & 0xffffu) + sgpr_offset;
-        cmdbuf[2] = instance_sgpr_offset == 0 ? 0 : (instance_sgpr_offset & 0xffffu) + sgpr_offset;
-        cmdbuf[3] = max_count;
-        cmdbuf[4] = sizeof(DrawIndexedIndirectArgs);
-        cmdbuf[5] = sceKernelIsNeoMode() ? flags & 0xe0000000u : 0;
-
-        cmdbuf += 6;
-        WriteTrailingNop<3>(cmdbuf);
-        return ORBIS_OK;
-    }
-    return -1;
 }
 
 int PS4_SYSV_ABI sceGnmDrawIndexMultiInstanced() {
@@ -2823,7 +2799,7 @@ int PS4_SYSV_ABI Func_F916890425496553() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceGnmDriver(Core::Loader::SymbolsResolver* sym) {
     LOG_INFO(Lib_GnmDriver, "Initializing presenter");
     liverpool = std::make_unique<AmdGpu::Liverpool>();
     presenter = std::make_unique<Vulkan::Presenter>(*g_window, liverpool.get());
@@ -2834,7 +2810,7 @@ void RegisterLib(Core::Loader::SymbolsResolver* sym) {
     }
 
     if (Config::copyGPUCmdBuffers()) {
-        liverpool->ReserveCopyBufferSpace();
+        liverpool->reserveCopyBufferSpace();
     }
 
     Platform::IrqC::Instance()->Register(Platform::InterruptId::GpuIdle, ResetSubmissionLock,

src/core/libraries/gnmdriver/gnmdriver.h

@@ -51,9 +51,7 @@ s32 PS4_SYSV_ABI sceGnmDrawIndexIndirectCountMulti(u32* cmdbuf, u32 size, u32 da
                                                    u32 max_count, u64 count_addr, u32 shader_stage,
                                                    u32 vertex_sgpr_offset, u32 instance_sgpr_offset,
                                                    u32 flags);
-int PS4_SYSV_ABI sceGnmDrawIndexIndirectMulti(u32* cmdbuf, u32 size, u32 data_offset, u32 max_count,
+int PS4_SYSV_ABI sceGnmDrawIndexIndirectMulti();
-                                              u32 shader_stage, u32 vertex_sgpr_offset,
-                                              u32 instance_sgpr_offset, u32 flags);
 int PS4_SYSV_ABI sceGnmDrawIndexMultiInstanced();
 s32 PS4_SYSV_ABI sceGnmDrawIndexOffset(u32* cmdbuf, u32 size, u32 index_offset, u32 index_count,
                                        u32 flags);
@@ -297,5 +295,5 @@ int PS4_SYSV_ABI Func_BFB41C057478F0BF();
 int PS4_SYSV_ABI Func_E51D44DB8151238C();
 int PS4_SYSV_ABI Func_F916890425496553();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceGnmDriver(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::GnmDriver

src/core/libraries/hmd/hmd.cpp

@@ -939,7 +939,7 @@ s32 PS4_SYSV_ABI Func_FF2E0E53015FE231() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceHmd(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("8gH1aLgty5I", "libsceHmdReprojectionMultilayer", 1, "libSceHmd", 1, 1,
                  sceHmdReprojectionStartMultilayer);
     LIB_FUNCTION("gEokC+OGI8g", "libSceHmdDistortion", 1, "libSceHmd", 1, 1,

src/core/libraries/hmd/hmd.h

@@ -199,5 +199,5 @@ s32 PS4_SYSV_ABI Func_B9A6FA0735EC7E49();
 s32 PS4_SYSV_ABI Func_FC193BD653F2AF2E();
 s32 PS4_SYSV_ABI Func_FF2E0E53015FE231();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceHmd(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::Hmd

src/core/libraries/ime/error_dialog.cpp

@@ -190,7 +190,7 @@ Status PS4_SYSV_ABI sceErrorDialogUpdateStatus() {
     return g_status;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceErrorDialog(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("ekXHb1kDBl0", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1,
                  sceErrorDialogClose);
     LIB_FUNCTION("t2FvHRXzgqk", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1,

src/core/libraries/ime/error_dialog.h

@@ -24,5 +24,5 @@ int PS4_SYSV_ABI sceErrorDialogOpenWithReport();
 CommonDialog::Error PS4_SYSV_ABI sceErrorDialogTerminate();
 CommonDialog::Status PS4_SYSV_ABI sceErrorDialogUpdateStatus();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceErrorDialog(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::ErrorDialog

src/core/libraries/ime/ime.cpp

@@ -18,11 +18,9 @@ static ImeUi g_ime_ui;
 class ImeHandler {
 public:
     ImeHandler(const OrbisImeKeyboardParam* param) {
-        LOG_INFO(Lib_Ime, "Creating ImeHandler for keyboard");
         Init(param, false);
     }
     ImeHandler(const OrbisImeParam* param) {
-        LOG_INFO(Lib_Ime, "Creating ImeHandler for IME");
         Init(param, true);
     }
     ~ImeHandler() = default;
@@ -40,18 +38,13 @@ public:
         openEvent.id = (ime_mode ? OrbisImeEventId::Open : OrbisImeEventId::KeyboardOpen);
 
         if (ime_mode) {
-            LOG_INFO(Lib_Ime, "calling sceImeGetPanelSize");
+            sceImeGetPanelSize(&m_param.ime, &openEvent.param.rect.width,
-            Error e = sceImeGetPanelSize(&m_param.ime, &openEvent.param.rect.width,
+                               &openEvent.param.rect.height);
-                                         &openEvent.param.rect.height);
-            if (e != Error::OK) {
-                LOG_ERROR(Lib_Ime, "sceImeGetPanelSize returned 0x{:X}", static_cast<u32>(e));
-            }
-
             openEvent.param.rect.x = m_param.ime.posx;
             openEvent.param.rect.y = m_param.ime.posy;
         } else {
-            openEvent.param.resource_id_array.user_id = 1;
+            openEvent.param.resource_id_array.userId = 1;
-            openEvent.param.resource_id_array.resource_id[0] = 1;
+            openEvent.param.resource_id_array.resourceId[0] = 1;
         }
 
         // Are we supposed to call the event handler on init with
@@ -66,13 +59,13 @@ public:
         }
     }
 
-    Error Update(OrbisImeEventHandler handler) {
+    s32 Update(OrbisImeEventHandler handler) {
         if (!m_ime_mode) {
             /* We don't handle any events for ImeKeyboard */
-            return Error::OK;
+            return ORBIS_OK;
         }
 
-        std::unique_lock<std::mutex> lock{g_ime_state.queue_mutex};
+        std::unique_lock lock{g_ime_state.queue_mutex};
 
         while (!g_ime_state.event_queue.empty()) {
             OrbisImeEvent event = g_ime_state.event_queue.front();
@@ -80,7 +73,7 @@ public:
             Execute(handler, &event, false);
         }
 
-        return Error::OK;
+        return ORBIS_OK;
     }
 
     void Execute(OrbisImeEventHandler handler, OrbisImeEvent* event, bool use_param_handler) {
@@ -101,14 +94,14 @@ public:
         }
     }
 
-    Error SetText(const char16_t* text, u32 length) {
+    s32 SetText(const char16_t* text, u32 length) {
         g_ime_state.SetText(text, length);
-        return Error::OK;
+        return ORBIS_OK;
     }
 
-    Error SetCaret(const OrbisImeCaret* caret) {
+    s32 SetCaret(const OrbisImeCaret* caret) {
         g_ime_state.SetCaret(caret->index);
-        return Error::OK;
+        return ORBIS_OK;
     }
 
     bool IsIme() {
@@ -151,24 +144,17 @@ int PS4_SYSV_ABI sceImeCheckUpdateTextInfo() {
     return ORBIS_OK;
 }
 
-Error PS4_SYSV_ABI sceImeClose() {
+s32 PS4_SYSV_ABI sceImeClose() {
-    LOG_INFO(Lib_Ime, "called");
+    LOG_INFO(Lib_Ime, "(STUBBED) called");
 
     if (!g_ime_handler) {
-        LOG_ERROR(Lib_Ime, "No IME handler is open");
+        return ORBIS_IME_ERROR_NOT_OPENED;
-        return Error::NOT_OPENED;
     }
 
     g_ime_handler.release();
-    if (g_ime_handler) {
-        LOG_ERROR(Lib_Ime, "Failed to close IME handler, it is still open");
-        return Error::INTERNAL;
-    }
     g_ime_ui = ImeUi();
     g_ime_state = ImeState();
-
+    return ORBIS_OK;
-    LOG_INFO(Lib_Ime, "IME closed successfully");
-    return Error::OK;
 }
 
 int PS4_SYSV_ABI sceImeConfigGet() {
@@ -236,193 +222,71 @@ int PS4_SYSV_ABI sceImeGetPanelPositionAndForm() {
     return ORBIS_OK;
 }
 
-Error PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u32* height) {
+s32 PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u32* height) {
-    LOG_INFO(Lib_Ime, "sceImeGetPanelSize called");
+    LOG_INFO(Lib_Ime, "called");
 
-    if (!param) {
+    if (!width || !height) {
-        LOG_ERROR(Lib_Ime, "Invalid param: NULL");
+        return ORBIS_IME_ERROR_INVALID_ADDRESS;
-        return Error::INVALID_ADDRESS;
-    }
-
-    if (!width) {
-        LOG_ERROR(Lib_Ime, "Invalid *width: NULL");
-        return Error::INVALID_ADDRESS;
-    }
-    if (!height) {
-        LOG_ERROR(Lib_Ime, "Invalid *height: NULL");
-        return Error::INVALID_ADDRESS;
-    }
-
-    if (static_cast<u32>(param->option) & ~0x7BFF) { // Basic check for invalid options
-        LOG_ERROR(Lib_Ime, "Invalid option: {:032b}", static_cast<u32>(param->option));
-        return Error::INVALID_OPTION;
     }
 
     switch (param->type) {
     case OrbisImeType::Default:
-        *width = 500;  // dummy value
-        *height = 100; // dummy value
-        LOG_DEBUG(Lib_Ime, "param->type: Default ({})", static_cast<u32>(param->type));
-        break;
     case OrbisImeType::BasicLatin:
-        *width = 500;  // dummy value
-        *height = 100; // dummy value
-        LOG_DEBUG(Lib_Ime, "param->type: BasicLatin ({})", static_cast<u32>(param->type));
-        break;
     case OrbisImeType::Url:
-        *width = 500;  // dummy value
-        *height = 100; // dummy value
-        LOG_DEBUG(Lib_Ime, "param->type: Url ({})", static_cast<u32>(param->type));
-        break;
     case OrbisImeType::Mail:
         // We set our custom sizes, commented sizes are the original ones
         *width = 500;  // 793
         *height = 100; // 408
-        LOG_DEBUG(Lib_Ime, "param->type: Mail ({})", static_cast<u32>(param->type));
         break;
     case OrbisImeType::Number:
         *width = 370;
         *height = 402;
-        LOG_DEBUG(Lib_Ime, "param->type: Number ({})", static_cast<u32>(param->type));
         break;
-    default:
-        LOG_ERROR(Lib_Ime, "Invalid param->type: ({})", static_cast<u32>(param->type));
-        return Error::INVALID_TYPE;
     }
 
-    LOG_INFO(Lib_Ime, "IME panel size: width={}, height={}", *width, *height);
+    return ORBIS_OK;
-    return Error::OK;
 }
 
-Error PS4_SYSV_ABI sceImeKeyboardClose(Libraries::UserService::OrbisUserServiceUserId userId) {
+s32 PS4_SYSV_ABI sceImeKeyboardClose(s32 userId) {
-    LOG_INFO(Lib_Ime, "called");
+    LOG_INFO(Lib_Ime, "(STUBBED) called");
 
     if (!g_keyboard_handler) {
-        LOG_ERROR(Lib_Ime, "No keyboard handler is open");
+        return ORBIS_IME_ERROR_NOT_OPENED;
-        return Error::NOT_OPENED;
-    }
-    // TODO: Check for valid user IDs. Disabled until user manager is ready.
-    if ((userId < 0 || userId > 4) && false) {
-        // Maybe g_keyboard_handler should hold a user ID and I must compare it here?
-        LOG_ERROR(Lib_Ime, "Invalid userId: {}", userId);
-        return Error::INVALID_USER_ID;
     }
 
     g_keyboard_handler.release();
-    if (g_keyboard_handler) {
+    return ORBIS_OK;
-        LOG_ERROR(Lib_Ime, "failed to close keyboard handler, it is still open");
-        return Error::INTERNAL;
-    }
-
-    LOG_INFO(Lib_Ime, "Keyboard handler closed successfully for user ID: {}", userId);
-    return Error::OK;
 }
 
 int PS4_SYSV_ABI sceImeKeyboardGetInfo() {
     LOG_ERROR(Lib_Ime, "(STUBBED) called");
     return ORBIS_OK;
 }
-Error PS4_SYSV_ABI
-sceImeKeyboardGetResourceId(Libraries::UserService::OrbisUserServiceUserId userId,
-                            OrbisImeKeyboardResourceIdArray* resourceIdArray) {
-    LOG_INFO(Lib_Ime, "(partial) called");
 
-    if (!resourceIdArray) {
+int PS4_SYSV_ABI sceImeKeyboardGetResourceId() {
-        LOG_ERROR(Lib_Ime, "Invalid resourceIdArray: NULL");
+    LOG_ERROR(Lib_Ime, "(STUBBED) called");
-        return Error::INVALID_ADDRESS;
+    return ORBIS_OK;
-    }
-
-    // TODO: Check for valid user IDs. Disabled until user manager is ready.
-    if ((userId < 0 || userId > 4) && false) {
-        LOG_ERROR(Lib_Ime, "Invalid userId: {}", userId);
-        resourceIdArray->user_id = userId;
-        for (u32& id : resourceIdArray->resource_id) {
-            id = 0;
-        }
-        return Error::INVALID_USER_ID;
-    }
-
-    if (!g_keyboard_handler) {
-        LOG_ERROR(Lib_Ime, "Keyboard handler not opened");
-        resourceIdArray->user_id = userId;
-        for (u32& id : resourceIdArray->resource_id) {
-            id = 0;
-        }
-        return Error::NOT_OPENED;
-    }
-
-    // Simulate "no USB keyboard connected", needed for some Unity engine games
-    resourceIdArray->user_id = userId;
-    for (u32& id : resourceIdArray->resource_id) {
-        id = 0;
-    }
-    LOG_INFO(Lib_Ime, "No USB keyboard connected (simulated)");
-    return Error::CONNECTION_FAILED;
-
-    // For future reference, if we had a real keyboard handler
-    return Error::OK;
 }
 
-Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUserId userId,
+s32 PS4_SYSV_ABI sceImeKeyboardOpen(s32 userId, const OrbisImeKeyboardParam* param) {
-                                      const OrbisImeKeyboardParam* param) {
     LOG_INFO(Lib_Ime, "called");
+
     if (!param) {
-        LOG_ERROR(Lib_Ime, "Invalid param: NULL");
+        return ORBIS_IME_ERROR_INVALID_ADDRESS;
-        return Error::INVALID_ADDRESS;
+    }
+    if (!param->arg) {
+        return ORBIS_IME_ERROR_INVALID_ARG;
     }
     if (!param->handler) {
-        LOG_ERROR(Lib_Ime, "Invalid param->handler: NULL");
+        return ORBIS_IME_ERROR_INVALID_HANDLER;
-        return Error::INVALID_HANDLER;
-    }
-    // seems like arg is optional, need to check if it is used in the handler
-    // Todo: check if arg is used in the handler, temporarily disabled
-    if (!param->arg && false) {
-        LOG_ERROR(Lib_Ime, "Invalid param->arg: NULL");
-        return Error::INVALID_ARG;
-    }
-    if (static_cast<u32>(param->option) & ~kValidOrbisImeKeyboardOptionMask) {
-        LOG_ERROR(Lib_Ime,
-                  "Invalid param->option\n"
-                  "option:    {:032b}\n"
-                  "validMask: {:032b}",
-                  static_cast<u32>(param->option), kValidOrbisImeKeyboardOptionMask);
-        return Error::INVALID_OPTION;
     }
 
-    // TODO: Check for valid user IDs. Disabled until user manager is ready.
-    if ((userId < 0 || userId > 4) && false) {
-        LOG_ERROR(Lib_Ime, "Invalid userId: {}", userId);
-        return Error::INVALID_USER_ID;
-    }
-    for (size_t i = 0; i < sizeof(param->reserved1); ++i) {
-        if (param->reserved1[i] != 0) {
-            LOG_ERROR(Lib_Ime, "Invalid reserved1: not zeroed");
-            return Error::INVALID_RESERVED;
-        }
-    }
-    for (size_t i = 0; i < sizeof(param->reserved2); ++i) {
-        if (param->reserved2[i] != 0) {
-            LOG_ERROR(Lib_Ime, "Invalid reserved2: not zeroed");
-            return Error::INVALID_RESERVED;
-        }
-    }
-
-    // Todo: figure out what it is, always false for now
-    if (false) {
-        LOG_ERROR(Lib_Ime, "USB keyboard some special kind of failure");
-        return Error::CONNECTION_FAILED;
-    }
     if (g_keyboard_handler) {
-        LOG_ERROR(Lib_Ime, "Keyboard handler is already open");
+        return ORBIS_IME_ERROR_BUSY;
-        return Error::BUSY;
     }
+
     g_keyboard_handler = std::make_unique<ImeHandler>(param);
-    if (!g_keyboard_handler) {
+    return ORBIS_OK;
-        LOG_ERROR(Lib_Ime, "Failed to create keyboard handler");
-        return Error::INTERNAL; // or Error::NO_MEMORY;
-    }
-    LOG_INFO(Lib_Ime, "Keyboard handler created successfully for user ID: {}", userId);
-    return Error::OK;
 }
 
 int PS4_SYSV_ABI sceImeKeyboardOpenInternal() {
@@ -440,190 +304,18 @@ int PS4_SYSV_ABI sceImeKeyboardUpdate() {
     return ORBIS_OK;
 }
 
-Error PS4_SYSV_ABI sceImeOpen(const OrbisImeParam* param, const OrbisImeParamExtended* extended) {
+s32 PS4_SYSV_ABI sceImeOpen(const OrbisImeParam* param, const void* extended) {
     LOG_INFO(Lib_Ime, "called");
 
     if (!param) {
-        LOG_ERROR(Lib_Ime, "Invalid param: NULL");
+        return ORBIS_IME_ERROR_INVALID_ADDRESS;
-        return Error::INVALID_ADDRESS;
-    } else {
-        // LOG_DEBUG values for debugging purposes
-        LOG_DEBUG(Lib_Ime, "param->user_id: {}", param->user_id);
-        LOG_DEBUG(Lib_Ime, "param->type: {}", static_cast<u32>(param->type));
-        LOG_DEBUG(Lib_Ime, "param->supported_languages: {:064b}",
-                  static_cast<u64>(param->supported_languages));
-        LOG_DEBUG(Lib_Ime, "param->enter_label: {}", static_cast<u32>(param->enter_label));
-        LOG_DEBUG(Lib_Ime, "param->input_method: {}", static_cast<u32>(param->input_method));
-        LOG_DEBUG(Lib_Ime, "param->filter: {:p}", reinterpret_cast<void*>(param->filter));
-        LOG_DEBUG(Lib_Ime, "param->option: {:032b}", static_cast<u32>(param->option));
-        LOG_DEBUG(Lib_Ime, "param->maxTextLength: {}", param->maxTextLength);
-        LOG_DEBUG(Lib_Ime, "param->inputTextBuffer: {:p}",
-                  static_cast<const void*>(param->inputTextBuffer));
-        LOG_DEBUG(Lib_Ime, "param->posx: {}", param->posx);
-        LOG_DEBUG(Lib_Ime, "param->posy: {}", param->posy);
-        LOG_DEBUG(Lib_Ime, "param->horizontal_alignment: {}",
-                  static_cast<u32>(param->horizontal_alignment));
-        LOG_DEBUG(Lib_Ime, "param->vertical_alignment: {}",
-                  static_cast<u32>(param->vertical_alignment));
-        LOG_DEBUG(Lib_Ime, "param->work: {:p}", param->work);
-        LOG_DEBUG(Lib_Ime, "param->arg: {:p}", param->arg);
-        LOG_DEBUG(Lib_Ime, "param->handler: {:p}", reinterpret_cast<void*>(param->handler));
     }
-
-    if (!extended) {
-        LOG_INFO(Lib_Ime, "Not used extended: NULL");
-    } else {
-        LOG_DEBUG(Lib_Ime, "extended->option: {:032b}", static_cast<u32>(extended->option));
-        LOG_DEBUG(Lib_Ime, "extended->color_base: {{{},{},{},{}}}", extended->color_base.r,
-                  extended->color_base.g, extended->color_base.b, extended->color_base.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_line: {{{},{},{},{}}}", extended->color_line.r,
-                  extended->color_line.g, extended->color_line.b, extended->color_line.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_text_field: {{{},{},{},{}}}",
-                  extended->color_text_field.r, extended->color_text_field.g,
-                  extended->color_text_field.b, extended->color_text_field.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_preedit: {{{},{},{},{}}}", extended->color_preedit.r,
-                  extended->color_preedit.g, extended->color_preedit.b, extended->color_preedit.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_button_default: {{{},{},{},{}}}",
-                  extended->color_button_default.r, extended->color_button_default.g,
-                  extended->color_button_default.b, extended->color_button_default.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_button_function: {{{},{},{},{}}}",
-                  extended->color_button_function.r, extended->color_button_function.g,
-                  extended->color_button_function.b, extended->color_button_function.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_button_symbol: {{{},{},{},{}}}",
-                  extended->color_button_symbol.r, extended->color_button_symbol.g,
-                  extended->color_button_symbol.b, extended->color_button_symbol.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_text: {{{},{},{},{}}}", extended->color_text.r,
-                  extended->color_text.g, extended->color_text.b, extended->color_text.a);
-        LOG_DEBUG(Lib_Ime, "extended->color_special: {{{},{},{},{}}}", extended->color_special.r,
-                  extended->color_special.g, extended->color_special.b, extended->color_special.a);
-        LOG_DEBUG(Lib_Ime, "extended->priority: {}", static_cast<u32>(extended->priority));
-        LOG_DEBUG(Lib_Ime, "extended->additional_dictionary_path: {:p}",
-                  static_cast<const void*>(extended->additional_dictionary_path));
-        LOG_DEBUG(Lib_Ime, "extended->ext_keyboard_filter: {:p}",
-                  reinterpret_cast<void*>(extended->ext_keyboard_filter));
-        LOG_DEBUG(Lib_Ime, "extended->disable_device: {:032b}",
-                  static_cast<u32>(extended->disable_device));
-        LOG_DEBUG(Lib_Ime, "extended->ext_keyboard_mode: {}", extended->ext_keyboard_mode);
-    }
-
-    if (param->user_id < 1 || param->user_id > 4) { // Todo: check valid user IDs
-        LOG_ERROR(Lib_Ime, "Invalid user_id: {}", static_cast<u32>(param->user_id));
-        return Error::INVALID_USER_ID;
-    }
-
-    if (!magic_enum::enum_contains(param->type)) {
-        LOG_ERROR(Lib_Ime, "Invalid type: {}", static_cast<u32>(param->type));
-        return Error::INVALID_TYPE;
-    }
-
-    if (static_cast<u64>(param->supported_languages) & ~kValidOrbisImeLanguageMask) {
-        LOG_ERROR(Lib_Ime,
-                  "Invalid supported_languages\n"
-                  "supported_languages: {:064b}\n"
-                  "valid_mask:          {:064b}",
-                  static_cast<u64>(param->supported_languages), kValidOrbisImeLanguageMask);
-        return Error::INVALID_SUPPORTED_LANGUAGES;
-    }
-
-    if (!magic_enum::enum_contains(param->enter_label)) {
-        LOG_ERROR(Lib_Ime, "Invalid enter_label: {}", static_cast<u32>(param->enter_label));
-        return Error::INVALID_ENTER_LABEL;
-    }
-
-    if (!magic_enum::enum_contains(param->input_method)) {
-        LOG_ERROR(Lib_Ime, "Invalid input_method: {}", static_cast<u32>(param->input_method));
-        return Error::INVALID_INPUT_METHOD;
-    }
-
-    if (static_cast<u32>(param->option) & ~kValidImeOptionMask) {
-        LOG_ERROR(Lib_Ime, "option has invalid bits set (0x{:X}), mask=(0x{:X})",
-                  static_cast<u32>(param->option), kValidImeOptionMask);
-        return Error::INVALID_OPTION;
-    }
-
-    if (param->maxTextLength == 0 || param->maxTextLength > ORBIS_IME_DIALOG_MAX_TEXT_LENGTH) {
-        LOG_ERROR(Lib_Ime, "Invalid maxTextLength: {}", param->maxTextLength);
-        return Error::INVALID_MAX_TEXT_LENGTH;
-    }
-
-    if (!param->inputTextBuffer) {
-        LOG_ERROR(Lib_Ime, "Invalid inputTextBuffer: NULL");
-        return Error::INVALID_INPUT_TEXT_BUFFER;
-    }
-
-    bool useHighRes = True(param->option & OrbisImeOption::USE_OVER_2K_COORDINATES);
-    const float maxWidth = useHighRes ? 3840.0f : 1920.0f;
-    const float maxHeight = useHighRes ? 2160.0f : 1080.0f;
-
-    if (param->posx < 0.0f || param->posx >= maxWidth) {
-        LOG_ERROR(Lib_Ime, "Invalid posx: {}, range: 0.0 - {}", param->posx, maxWidth);
-        return Error::INVALID_POSX;
-    }
-    if (param->posy < 0.0f || param->posy >= maxHeight) {
-        LOG_ERROR(Lib_Ime, "Invalid posy: {}, range: 0.0 - {}", param->posy, maxHeight);
-        return Error::INVALID_POSY;
-    }
-
-    if (!magic_enum::enum_contains(param->horizontal_alignment)) {
-        LOG_ERROR(Lib_Ime, "Invalid horizontal_alignment: {}",
-                  static_cast<u32>(param->horizontal_alignment));
-        return Error::INVALID_HORIZONTALIGNMENT;
-    }
-    if (!magic_enum::enum_contains(param->vertical_alignment)) {
-        LOG_ERROR(Lib_Ime, "Invalid vertical_alignment: {}",
-                  static_cast<u32>(param->vertical_alignment));
-        return Error::INVALID_VERTICALALIGNMENT;
-    }
-
-    if (extended) {
-        u32 ext_option_value = static_cast<u32>(extended->option);
-        if (ext_option_value & ~kValidImeExtOptionMask) {
-            LOG_ERROR(Lib_Ime,
-                      "Invalid extended->option\n"
-                      "option: {:032b}\n"
-                      "valid_mask: {:032b}",
-                      ext_option_value, kValidImeExtOptionMask);
-            return Error::INVALID_EXTENDED;
-        }
-    }
-
-    if (!param->work) {
-        LOG_ERROR(Lib_Ime, "Invalid work: NULL");
-        return Error::INVALID_WORK;
-    }
-
-    // Todo: validate arg
-    if (false) {
-        LOG_ERROR(Lib_Ime, "Invalid arg: NULL");
-        return Error::INVALID_ARG;
-    }
-
-    // Todo: validate handler
-    if (false) {
-        LOG_ERROR(Lib_Ime, "Invalid handler: NULL");
-        return Error::INVALID_HANDLER;
-    }
-
-    for (size_t i = 0; i < sizeof(param->reserved); ++i) {
-        if (param->reserved[i] != 0) {
-            LOG_ERROR(Lib_Ime, "Invalid reserved: not zeroed");
-            return Error::INVALID_RESERVED;
-        }
-    }
-
     if (g_ime_handler) {
-        LOG_ERROR(Lib_Ime, "IME handler is already open");
+        return ORBIS_IME_ERROR_BUSY;
-        return Error::BUSY;
     }
 
     g_ime_handler = std::make_unique<ImeHandler>(param);
-    if (!g_ime_handler) {
+    return ORBIS_OK;
-        LOG_ERROR(Lib_Ime, "Failed to create IME handler");
-        return Error::NO_MEMORY; // or Error::INTERNAL
-    }
-
-    LOG_INFO(Lib_Ime, "IME handler created successfully");
-    return Error::OK;
 }
 
 int PS4_SYSV_ABI sceImeOpenInternal() {
@@ -632,7 +324,7 @@ int PS4_SYSV_ABI sceImeOpenInternal() {
 }
 
 void PS4_SYSV_ABI sceImeParamInit(OrbisImeParam* param) {
-    LOG_INFO(Lib_Ime, "sceImeParamInit called");
+    LOG_INFO(Lib_Ime, "called");
 
     if (!param) {
         return;
@@ -647,27 +339,27 @@ int PS4_SYSV_ABI sceImeSetCandidateIndex() {
     return ORBIS_OK;
 }
 
-Error PS4_SYSV_ABI sceImeSetCaret(const OrbisImeCaret* caret) {
+int PS4_SYSV_ABI sceImeSetCaret(const OrbisImeCaret* caret) {
     LOG_TRACE(Lib_Ime, "called");
 
     if (!g_ime_handler) {
-        return Error::NOT_OPENED;
+        return ORBIS_IME_ERROR_NOT_OPENED;
     }
     if (!caret) {
-        return Error::INVALID_ADDRESS;
+        return ORBIS_IME_ERROR_INVALID_ADDRESS;
     }
 
     return g_ime_handler->SetCaret(caret);
 }
 
-Error PS4_SYSV_ABI sceImeSetText(const char16_t* text, u32 length) {
+s32 PS4_SYSV_ABI sceImeSetText(const char16_t* text, u32 length) {
     LOG_TRACE(Lib_Ime, "called");
 
     if (!g_ime_handler) {
-        return Error::NOT_OPENED;
+        return ORBIS_IME_ERROR_NOT_OPENED;
     }
     if (!text) {
-        return Error::INVALID_ADDRESS;
+        return ORBIS_IME_ERROR_INVALID_ADDRESS;
     }
 
     return g_ime_handler->SetText(text, length);
@@ -678,7 +370,7 @@ int PS4_SYSV_ABI sceImeSetTextGeometry() {
     return ORBIS_OK;
 }
 
-Error PS4_SYSV_ABI sceImeUpdate(OrbisImeEventHandler handler) {
+s32 PS4_SYSV_ABI sceImeUpdate(OrbisImeEventHandler handler) {
     if (g_ime_handler) {
         g_ime_handler->Update(handler);
     }
@@ -688,10 +380,10 @@ Error PS4_SYSV_ABI sceImeUpdate(OrbisImeEventHandler handler) {
     }
 
     if (!g_ime_handler || !g_keyboard_handler) {
-        return Error::NOT_OPENED;
+        return ORBIS_IME_ERROR_NOT_OPENED;
     }
 
-    return Error::OK;
+    return ORBIS_OK;
 }
 
 int PS4_SYSV_ABI sceImeVshClearPreedit() {
@@ -789,7 +481,7 @@ int PS4_SYSV_ABI sceImeVshUpdateContext2() {
     return ORBIS_OK;
 }
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym) {
+void RegisterlibSceIme(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("mN+ZoSN-8hQ", "libSceIme", 1, "libSceIme", 1, 1, FinalizeImeModule);
     LIB_FUNCTION("uTW+63goeJs", "libSceIme", 1, "libSceIme", 1, 1, InitializeImeModule);
     LIB_FUNCTION("Lf3DeGWC6xg", "libSceIme", 1, "libSceIme", 1, 1, sceImeCheckFilterText);

src/core/libraries/ime/ime.h

@@ -13,12 +13,78 @@ class SymbolsResolver;
 
 namespace Libraries::Ime {
 
+constexpr u32 ORBIS_IME_MAX_TEXT_LENGTH = 2048;
+
+enum class OrbisImeKeyboardOption : u32 {
+    Default = 0,
+    Repeat = 1,
+    RepeatEachKey = 2,
+    AddOsk = 4,
+    EffectiveWithIme = 8,
+    DisableResume = 16,
+    DisableCapslockWithoutShift = 32,
+};
+DECLARE_ENUM_FLAG_OPERATORS(OrbisImeKeyboardOption)
+
+enum class OrbisImeOption : u32 {
+    DEFAULT = 0,
+    MULTILINE = 1,
+    NO_AUTO_CAPITALIZATION = 2,
+    PASSWORD = 4,
+    LANGUAGES_FORCED = 8,
+    EXT_KEYBOARD = 16,
+    NO_LEARNING = 32,
+    FIXED_POSITION = 64,
+    DISABLE_RESUME = 256,
+    DISABLE_AUTO_SPACE = 512,
+    DISABLE_POSITION_ADJUSTMENT = 2048,
+    EXPANDED_PREEDIT_BUFFER = 4096,
+    USE_JAPANESE_EISUU_KEY_AS_CAPSLOCK = 8192,
+    USE_2K_COORDINATES = 16384,
+};
+DECLARE_ENUM_FLAG_OPERATORS(OrbisImeOption)
+
+struct OrbisImeKeyboardParam {
+    OrbisImeKeyboardOption option;
+    s8 reserved1[4];
+    void* arg;
+    OrbisImeEventHandler handler;
+    s8 reserved2[8];
+};
+
+struct OrbisImeParam {
+    s32 user_id;
+    OrbisImeType type;
+    u64 supported_languages;
+    OrbisImeEnterLabel enter_label;
+    OrbisImeInputMethod input_method;
+    OrbisImeTextFilter filter;
+    OrbisImeOption option;
+    u32 maxTextLength;
+    char16_t* inputTextBuffer;
+    float posx;
+    float posy;
+    OrbisImeHorizontalAlignment horizontal_alignment;
+    OrbisImeVerticalAlignment vertical_alignment;
+    void* work;
+    void* arg;
+    OrbisImeEventHandler handler;
+    s8 reserved[8];
+};
+
+struct OrbisImeCaret {
+    f32 x;
+    f32 y;
+    u32 height;
+    u32 index;
+};
+
 int PS4_SYSV_ABI FinalizeImeModule();
 int PS4_SYSV_ABI InitializeImeModule();
 int PS4_SYSV_ABI sceImeCheckFilterText();
 int PS4_SYSV_ABI sceImeCheckRemoteEventParam();
 int PS4_SYSV_ABI sceImeCheckUpdateTextInfo();
-Error PS4_SYSV_ABI sceImeClose();
+int PS4_SYSV_ABI sceImeClose();
 int PS4_SYSV_ABI sceImeConfigGet();
 int PS4_SYSV_ABI sceImeConfigSet();
 int PS4_SYSV_ABI sceImeConfirmCandidate();
@@ -32,25 +98,22 @@ int PS4_SYSV_ABI sceImeDisableController();
 int PS4_SYSV_ABI sceImeFilterText();
 int PS4_SYSV_ABI sceImeForTestFunction();
 int PS4_SYSV_ABI sceImeGetPanelPositionAndForm();
-Error PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u32* height);
+s32 PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u32* height);
-Error PS4_SYSV_ABI sceImeKeyboardClose(Libraries::UserService::OrbisUserServiceUserId userId);
+s32 PS4_SYSV_ABI sceImeKeyboardClose(s32 userId);
 int PS4_SYSV_ABI sceImeKeyboardGetInfo();
-Error PS4_SYSV_ABI
+int PS4_SYSV_ABI sceImeKeyboardGetResourceId();
-sceImeKeyboardGetResourceId(Libraries::UserService::OrbisUserServiceUserId userId,
+s32 PS4_SYSV_ABI sceImeKeyboardOpen(s32 userId, const OrbisImeKeyboardParam* param);
-                            OrbisImeKeyboardResourceIdArray* resourceIdArray);
-Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUserId userId,
-                                      const OrbisImeKeyboardParam* param);
 int PS4_SYSV_ABI sceImeKeyboardOpenInternal();
 int PS4_SYSV_ABI sceImeKeyboardSetMode();
 int PS4_SYSV_ABI sceImeKeyboardUpdate();
-Error PS4_SYSV_ABI sceImeOpen(const OrbisImeParam* param, const OrbisImeParamExtended* extended);
+s32 PS4_SYSV_ABI sceImeOpen(const OrbisImeParam* param, const void* extended);
 int PS4_SYSV_ABI sceImeOpenInternal();
 void PS4_SYSV_ABI sceImeParamInit(OrbisImeParam* param);
 int PS4_SYSV_ABI sceImeSetCandidateIndex();
-Error PS4_SYSV_ABI sceImeSetCaret(const OrbisImeCaret* caret);
+s32 PS4_SYSV_ABI sceImeSetCaret(const OrbisImeCaret* caret);
-Error PS4_SYSV_ABI sceImeSetText(const char16_t* text, u32 length);
+s32 PS4_SYSV_ABI sceImeSetText(const char16_t* text, u32 length);
 int PS4_SYSV_ABI sceImeSetTextGeometry();
-Error PS4_SYSV_ABI sceImeUpdate(OrbisImeEventHandler handler);
+s32 PS4_SYSV_ABI sceImeUpdate(OrbisImeEventHandler handler);
 int PS4_SYSV_ABI sceImeVshClearPreedit();
 int PS4_SYSV_ABI sceImeVshClose();
 int PS4_SYSV_ABI sceImeVshConfirmPreedit();
@@ -71,6 +134,6 @@ int PS4_SYSV_ABI sceImeVshUpdate();
 int PS4_SYSV_ABI sceImeVshUpdateContext();
 int PS4_SYSV_ABI sceImeVshUpdateContext2();
 
-void RegisterLib(Core::Loader::SymbolsResolver* sym);
+void RegisterlibSceIme(Core::Loader::SymbolsResolver* sym);
 
 } // namespace Libraries::Ime