fix movaps being evil

[dynarmic] VEX encode movd/movq
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-08-19 14:36:15 +00:00 · 2026-05-24 19:03:16 +00:00 · 2026-05-24 18:47:11 +00:00
340 changed files with 16702 additions and 24823 deletions
@@ -0,0 +1,89 @@
+From 509be32bbfa6eb95014860f7c9ea6d45c8ddaa56 Mon Sep 17 00:00:00 2001
+From: crueter <crueter@eden-emu.dev>
+Date: Sun, 8 Mar 2026 15:11:12 -0400
+Subject: [PATCH] [cmake] Simplify zstd find logic, and support pre-existing
+ zstd target
+
+Some deduplication work on the zstd required/if-available logic. Also
+adds support for pre-existing `zstd::libzstd` which is useful for
+projects that bundle their own zstd in a way that doesn't get caught by
+`CONFIG`
+
+Signed-off-by: crueter <crueter@eden-emu.dev>
+---
+ CMakeLists.txt | 46 ++++++++++++++++++++++++++--------------------
+ 1 file changed, 26 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1874e36be0..8d31198006 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -241,28 +241,34 @@ endif()
+ # NOTE:
+ # zstd < 1.5.6 does not provide the CMake imported target `zstd::libzstd`.
+ # Older versions must be consumed via their pkg-config file.
+-if(HTTPLIB_REQUIRE_ZSTD)
+-	find_package(zstd 1.5.6 CONFIG)
+-	if(NOT zstd_FOUND)
+-		find_package(PkgConfig REQUIRED)
+-		pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
+-		add_library(zstd::libzstd ALIAS PkgConfig::zstd)
+-	endif()
+-	set(HTTPLIB_IS_USING_ZSTD TRUE)
+-elseif(HTTPLIB_USE_ZSTD_IF_AVAILABLE)
+-	find_package(zstd 1.5.6 CONFIG QUIET)
+-	if(NOT zstd_FOUND)
+-		find_package(PkgConfig QUIET)
+-		if(PKG_CONFIG_FOUND)
+-			pkg_check_modules(zstd QUIET IMPORTED_TARGET libzstd)
+-
+-			if(TARGET PkgConfig::zstd)
+if (HTTPLIB_REQUIRE_ZSTD)
+	set(HTTPLIB_ZSTD_REQUESTED ON)
+	set(HTTPLIB_ZSTD_REQUIRED REQUIRED)
+elseif (HTTPLIB_USE_ZSTD_IF_AVAILABLE)
+	set(HTTPLIB_ZSTD_REQUESTED ON)
+	set(HTTPLIB_ZSTD_REQUIRED QUIET)
+endif()
+
+if (HTTPLIB_ZSTD_REQUESTED)
+	if (TARGET zstd::libzstd)
+		set(HTTPLIB_IS_USING_ZSTD TRUE)
+	else()
+		find_package(zstd 1.5.6 CONFIG QUIET)
+
+		if (NOT zstd_FOUND)
+			find_package(PkgConfig ${HTTPLIB_ZSTD_REQUIRED})
+			pkg_check_modules(zstd ${HTTPLIB_ZSTD_REQUIRED} IMPORTED_TARGET libzstd)
+
+			if (TARGET PkgConfig::zstd)
+ 				add_library(zstd::libzstd ALIAS PkgConfig::zstd)
+ 			endif()
+ 		endif()
+
+		# This will always be true if zstd is required.
+		# If zstd *isn't* found when zstd is set to required,
+		# CMake will error out earlier in this block.
+		set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
+ 	endif()
+-	# Both find_package and PkgConf set a XXX_FOUND var
+-	set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
+ endif()
+ 
+ # Used for default, common dirs that the end-user can change (if needed)
+@@ -317,13 +323,13 @@ if(HTTPLIB_COMPILE)
+ 			$<BUILD_INTERFACE:${_httplib_build_includedir}/httplib.h>
+ 			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/httplib.h>
+ 	)
+-	
+
+ 	# Add C++20 module support if requested
+ 	# Include from separate file to prevent parse errors on older CMake versions
+ 	if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.28")
+ 		include(cmake/modules.cmake)
+ 	endif()
+-	
+
+ 	set_target_properties(${PROJECT_NAME}
+ 		PROPERTIES
+ 			VERSION ${${PROJECT_NAME}_VERSION}
@@ -1,214 +0,0 @@
-From ec4c1fdf526cb9ad045abf59b29ee495bbf5023a Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Sat, 30 May 2026 20:56:35 -0400
-Subject: [PATCH] cpmutil compat
-
---
- CMakeLists.txt           | 31 ++++++++-----------
- cmake/FetchOpenSSL.cmake | 64 ----------------------------------------
- cmake/GetCPM.cmake       |  5 ----
- 3 files changed, 13 insertions(+), 87 deletions(-)
- delete mode 100644 cmake/FetchOpenSSL.cmake
- delete mode 100644 cmake/GetCPM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5420ecc..9ffd5a0 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,9 +19,7 @@ include(FetchContent)
- include(ProcessorCount)
- include(cmake/ConfigureOpenSSL.cmake)
- include(cmake/DetectTargetPlatform.cmake)
-include(cmake/FetchOpenSSL.cmake)
- include(cmake/FindVcvarsall.cmake)
-include(cmake/GetCPM.cmake)
- 
- # Custom options
- option(OPENSSL_BUILD_VERBOSE "Enable verbose output from build" OFF)
-@@ -47,9 +45,6 @@ if("${OPENSSL_TARGET_PLATFORM}" STREQUAL "")
-     detect_target_platform(OPENSSL_TARGET_PLATFORM)
- endif()
- 
-# Fetch OpenSSL source
-fetch_openssl()
-
- # Apply patches
- foreach(patch IN LISTS OPENSSL_PATCH)
-     if(EXISTS "${patch}" AND NOT IS_DIRECTORY "${patch}")
-@@ -59,13 +54,13 @@ foreach(patch IN LISTS OPENSSL_PATCH)
- 
-         execute_process(
-             COMMAND git init
-            WORKING_DIRECTORY ${openssl_SOURCE_DIR}
-+            WORKING_DIRECTORY ${OpenSSL_SOURCE_DIR}
-             OUTPUT_QUIET
-             ERROR_QUIET
-         )
-         execute_process(
-             COMMAND git apply ${patch}
-            WORKING_DIRECTORY ${openssl_SOURCE_DIR}
-+            WORKING_DIRECTORY ${OpenSSL_SOURCE_DIR}
-             OUTPUT_QUIET
-             ERROR_QUIET
-         )
-@@ -161,8 +156,8 @@ list(PREPEND OPENSSL_CONFIGURE_OPTIONS ${OPENSSL_TARGET_PLATFORM})
- # Configure OpenSSL
- configure_openssl(
-     COMMAND ${VCVARSALL_COMMAND}
-    FILE ${openssl_SOURCE_DIR}/Configure
-    BUILD_DIR ${openssl_BINARY_DIR}
-+    FILE ${OpenSSL_SOURCE_DIR}/Configure
-+    BUILD_DIR ${OpenSSL_BINARY_DIR}
-     OPTIONS ${OPENSSL_CONFIGURE_OPTIONS}
- )
- 
-@@ -203,8 +198,8 @@ endif()
- # Parse Makefile
- parse_makefile(${OPENSSL_MAKEFILE} "INSTALL_LIBS" OPENSSL_STATIC_LIBS)
- parse_makefile(${OPENSSL_MAKEFILE} "INSTALL_SHLIBS" OPENSSL_SHARED_LIBS)
-list(TRANSFORM OPENSSL_STATIC_LIBS PREPEND "${openssl_BINARY_DIR}/")
-list(TRANSFORM OPENSSL_SHARED_LIBS PREPEND "${openssl_BINARY_DIR}/")
-+list(TRANSFORM OPENSSL_STATIC_LIBS PREPEND "${OpenSSL_BINARY_DIR}/")
-+list(TRANSFORM OPENSSL_SHARED_LIBS PREPEND "${OpenSSL_BINARY_DIR}/")
- 
- foreach(LIBRARY IN LISTS OPENSSL_STATIC_LIBS)
-     if(LIBRARY MATCHES "crypto")
-@@ -239,14 +234,14 @@ endif()
- 
- # Provide same targets and variables as FindOpenSSL module
- set(OPENSSL_FOUND ON CACHE BOOL "Override FindOpenSSL variables" FORCE)
-set(OPENSSL_INCLUDE_DIR ${openssl_SOURCE_DIR}/include ${openssl_BINARY_DIR}/include CACHE STRING "Override FindOpenSSL variables" FORCE)
-+set(OPENSSL_INCLUDE_DIR ${OpenSSL_SOURCE_DIR}/include ${OpenSSL_BINARY_DIR}/include CACHE STRING "Override FindOpenSSL variables" FORCE)
- set(OPENSSL_CRYPTO_LIBRARY ${OPENSSL_${OPENSSL_LIBRARY_TYPE}_CRYPTO_LIBRARY} CACHE STRING "Override FindOpenSSL variables" FORCE)
- set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
- set(OPENSSL_SSL_LIBRARY ${OPENSSL_${OPENSSL_LIBRARY_TYPE}_SSL_LIBRARY} CACHE STRING "Override FindOpenSSL variables" FORCE)
- set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
- set(OPENSSL_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
- set(OPENSSL_VERSION ${OPENSSL_CONFIGURED_VERSION} CACHE STRING "Override FindOpenSSL variables" FORCE)
-set(OPENSSL_APPLINK_SOURCE ${openssl_SOURCE_DIR}/ms/applink.c CACHE STRING "Override FindOpenSSL variables" FORCE)
-+set(OPENSSL_APPLINK_SOURCE ${OpenSSL_SOURCE_DIR}/ms/applink.c CACHE STRING "Override FindOpenSSL variables" FORCE)
- 
- add_library(OpenSSL::Crypto ${OPENSSL_LIBRARY_TYPE} IMPORTED GLOBAL)
- add_library(OpenSSL::SSL ${OPENSSL_LIBRARY_TYPE} IMPORTED GLOBAL)
-@@ -308,8 +303,8 @@ if(ANDROID)
- endif()
- 
- file(GLOB_RECURSE OPENSSL_SOURCES
-    ${openssl_SOURCE_DIR}/*.[ch]
-    ${openssl_SOURCE_DIR}/*.[ch].in
-+    ${OpenSSL_SOURCE_DIR}/*.[ch]
-+    ${OpenSSL_SOURCE_DIR}/*.[ch].in
- )
- 
- set(OPENSSL_BUILD_OUTPUT
-@@ -322,7 +317,7 @@ add_custom_command(
-     OUTPUT ${OPENSSL_BUILD_OUTPUT}
-     COMMAND ${OPENSSL_BUILD_COMMAND}
-     DEPENDS ${OPENSSL_SOURCES}
-    WORKING_DIRECTORY ${openssl_BINARY_DIR}
-+    WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
-     VERBATIM
- )
- 
-@@ -341,7 +336,7 @@ if(OPENSSL_TEST AND NOT CMAKE_CROSSCOMPILING)
-     add_test(
-         NAME openssl-test
-         COMMAND ${OPENSSL_BUILD_TOOL} test VERBOSE_FAILURE=yes HARNESS_JOBS=${NUMBER_OF_THREADS}
-        WORKING_DIRECTORY ${openssl_BINARY_DIR}
-+        WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
-     )
- endif()
- 
-@@ -356,7 +351,7 @@ if(OPENSSL_INSTALL)
-     install(CODE
-         "execute_process(
-             COMMAND ${OPENSSL_INSTALL_COMMAND}
-            WORKING_DIRECTORY \"${openssl_BINARY_DIR}\"
-+            WORKING_DIRECTORY \"${OpenSSL_BINARY_DIR}\"
-         )"
-     )
- endif()
-diff --git a/cmake/FetchOpenSSL.cmake b/cmake/FetchOpenSSL.cmake
-deleted file mode 100644
-index a43505d..0000000
--- a/cmake/FetchOpenSSL.cmake
-+++ /dev/null
-@@ -1,64 +0,0 @@
-function(fetch_openssl)
-    if(EXISTS "${OPENSSL_SOURCE}" AND IS_DIRECTORY "${OPENSSL_SOURCE}")
-        # Fetch the local OpenSSL source
-        if(NOT IS_ABSOLUTE "${OPENSSL_SOURCE}")
-            string(PREPEND OPENSSL_SOURCE ${CMAKE_SOURCE_DIR}/)
-        endif()
-
-        string(REPLACE "\\" "/" openssl-source_SOURCE_DIR "${OPENSSL_SOURCE}")
-        set(openssl-source_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/openssl-source-build)
-    else()
-        set(CPM_OPTIONS
-            NAME openssl-source
-            DOWNLOAD_ONLY ON
-        )
-
-        if(NOT OPENSSL_CONFIGURE_VERBOSE)
-            list(APPEND CPM_OPTIONS QUIET)
-        endif()
-
-        if("${OPENSSL_SOURCE}" MATCHES "^http")
-            # Download OpenSSL source from the internet
-            list(APPEND CPM_OPTIONS URL ${OPENSSL_SOURCE})
-        else()
-            # Download OpenSSL source from the official website
-            if("${OPENSSL_TARGET_VERSION}" STREQUAL "")
-                set(OPENSSL_TARGET_VERSION ${PROJECT_VERSION})
-            endif()
-
-            if(OPENSSL_TARGET_VERSION VERSION_EQUAL PROJECT_VERSION)
-                list(APPEND CPM_OPTIONS URL_HASH SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f)
-            endif()
-
-            if(OPENSSL_TARGET_VERSION MATCHES "^1\.1\.1[a-w]$")
-                string(REPLACE "." "_" OPENSSL_TAGGED_VERSION ${OPENSSL_TARGET_VERSION})
-                list(APPEND CPM_OPTIONS URL https://github.com/openssl/openssl/releases/download/OpenSSL_${OPENSSL_TAGGED_VERSION}/openssl-${OPENSSL_TARGET_VERSION}.tar.gz)
-            else()
-                list(APPEND CPM_OPTIONS URL https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_TARGET_VERSION}/openssl-${OPENSSL_TARGET_VERSION}.tar.gz)
-            endif()
-        endif()
-
-        CPMAddPackage(${CPM_OPTIONS})
-    endif()
-
-    # Clean build directory if source directory has changed
-    if(DEFINED CACHE{openssl-source_SOURCE_DIR_OLD} AND NOT openssl-source_SOURCE_DIR STREQUAL openssl-source_SOURCE_DIR_OLD)
-        set(openssl-source_SOURCE_DIR_OLD ${openssl-source_SOURCE_DIR} CACHE INTERNAL "Previously fetched OpenSSL source")
-
-        if(IS_DIRECTORY ${openssl-source_BINARY_DIR})
-            file(REMOVE_RECURSE ${openssl-source_BINARY_DIR})
-            file(MAKE_DIRECTORY ${openssl-source_BINARY_DIR})
-        endif()
-    endif()
-
-    # Override the FindOpenSSL module
-    FetchContent_Declare(
-        OpenSSL
-        SOURCE_DIR ${openssl-source_SOURCE_DIR}
-        BINARY_DIR ${openssl-source_BINARY_DIR}
-        OVERRIDE_FIND_PACKAGE
-    )
-    FetchContent_MakeAvailable(OpenSSL)
-
-    return(PROPAGATE openssl_SOURCE_DIR openssl_BINARY_DIR)
-endfunction()
-diff --git a/cmake/GetCPM.cmake b/cmake/GetCPM.cmake
-deleted file mode 100644
-index bfc50f5..0000000
--- a/cmake/GetCPM.cmake
-+++ /dev/null
-@@ -1,5 +0,0 @@
-file(
-    DOWNLOAD https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/get_cpm.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/get_cpm.cmake
-)
-include(${CMAKE_CURRENT_BINARY_DIR}/get_cpm.cmake)
-- 
-2.54.0
-
@@ -1,54 +0,0 @@
-From d46675fbb61eb6d51e478023ce4075e545ad4cfd Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Sat, 30 May 2026 21:11:55 -0400
-Subject: [PATCH] use ccache
-
---
- CMakeLists.txt               |  1 -
- cmake/ConfigureOpenSSL.cmake | 12 +++---------
- 2 files changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ffd5a0..9ff14c8 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,7 +28,6 @@ option(OPENSSL_ENABLE_PARALLEL "Build and test in parallel if possible" ON)
- option(OPENSSL_INSTALL "Install OpenSSL components to the <prefix> directory" OFF)
- option(OPENSSL_INSTALL_CERT "Install cert.pem to the <openssldir> directory" OFF)
- option(OPENSSL_TEST "Enable testing and build OpenSSL self tests" OFF)
-option(OPENSSL_USE_CCACHE "Use ccache if available" ON)
- 
- if("${OPENSSL_BUILD_TARGET}" STREQUAL "")
-     # Makefile target for build
-diff --git a/cmake/ConfigureOpenSSL.cmake b/cmake/ConfigureOpenSSL.cmake
-index 211c18b..3d8cbed 100644
--- a/cmake/ConfigureOpenSSL.cmake
-+++ b/cmake/ConfigureOpenSSL.cmake
-@@ -69,15 +69,9 @@ function(apply_ccache FILE)
-         message(FATAL_ERROR "Couldn't find Makefile")
-     endif()
- 
-    if(OPENSSL_USE_CCACHE)
-        find_program(CCACHE ccache)
-
-        if(NOT CCACHE)
-            return()
-        endif()
-
-+    if(USE_CCACHE)
-         file(READ ${FILE} MAKEFILE)
-        string(REPLACE "\nCC=" "\nCC=ccache " MAKEFILE "${MAKEFILE}")
-+        string(REPLACE "\nCC=" "\nCC=${CCACHE_BINARY} " MAKEFILE "${MAKEFILE}")
- 
-         if(MSVC)
-             string(REPLACE "/Zi /Fdossl_static.pdb " "" MAKEFILE "${MAKEFILE}")
-@@ -171,4 +165,4 @@ function(configure_openssl)
-         string(REPLACE "/W3" "/W0" MAKEFILE "${MAKEFILE}")
-         file(WRITE ${OPENSSL_MAKEFILE} "${MAKEFILE}")
-     endif()
-endfunction()
-\ No newline at end of file
-+endfunction()
-- 
-2.54.0
-
@@ -1,28 +0,0 @@
-From 4a3cc92a7abad403529ed1cb4255ca63d9252de4 Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Sat, 30 May 2026 21:48:42 -0400
-Subject: [PATCH 2/2] use cmake compiler flags
-
---
- cmake/ConfigureOpenSSL.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/ConfigureOpenSSL.cmake b/cmake/ConfigureOpenSSL.cmake
-index 3d8cbed..3012e05 100644
--- a/cmake/ConfigureOpenSSL.cmake
-+++ b/cmake/ConfigureOpenSSL.cmake
-@@ -135,7 +135,10 @@ function(configure_openssl)
-     endif()
- 
-     execute_process(
-        COMMAND ${CONFIGURE_COMMAND}
-+        COMMAND ${CMAKE_COMMAND} -E env
-+            "CFLAGS=${CMAKE_C_FLAGS}"
-+            "CXXFLAGS=${CMAKE_CXX_FLAGS}"
-+            ${CONFIGURE_COMMAND}
-         WORKING_DIRECTORY ${CONFIGURE_BUILD_DIR}
-         ${VERBOSE_OPTION}
-         COMMAND_ERROR_IS_FATAL ANY
-- 
-2.54.0
-
@@ -1,39 +0,0 @@
--- a/CMakeLists.txt	2026-06-01 23:53:16.498043856 -0400
-+++ b/CMakeLists.txt	2026-06-01 23:53:23.910543615 -0400
-@@ -312,13 +312,29 @@
-     ${OPENSSL_SHARED_CRYPTO_LIBRARY}
-     ${OPENSSL_SHARED_SSL_LIBRARY}
- )
-add_custom_command(
-    OUTPUT ${OPENSSL_BUILD_OUTPUT}
-    COMMAND ${OPENSSL_BUILD_COMMAND}
-    DEPENDS ${OPENSSL_SOURCES}
-    WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
-    VERBATIM
-)
-+if (WIN32)
-+    add_custom_command(
-+        OUTPUT ${OPENSSL_BUILD_OUTPUT}
-+        COMMAND ${OPENSSL_BUILD_COMMAND}
-+        DEPENDS ${OPENSSL_SOURCES}
-+        WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
-+        VERBATIM)
-+else()
-+    set(_openssl_build_script "${CMAKE_CURRENT_BINARY_DIR}/BuildOpenSSL.cmake")
-+    file(WRITE ${_openssl_build_script}
-+        "execute_process(\n"
-+        "    COMMAND ${OPENSSL_BUILD_COMMAND}\n"
-+        "    WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}\n"
-+        "    RESULT_VARIABLE _r)\n"
-+        "if(_r)\n"
-+        "    message(FATAL_ERROR \"OpenSSL build failed: \${_r}\")\n"
-+        "endif()\n")
-+    add_custom_command(
-+        OUTPUT ${OPENSSL_BUILD_OUTPUT}
-+        COMMAND ${CMAKE_COMMAND} -P ${_openssl_build_script}
-+        DEPENDS ${OPENSSL_SOURCES}
-+        VERBATIM)
-+endif()
- 
- if(PROJECT_IS_TOP_LEVEL)
-     add_custom_target(openssl-build ALL DEPENDS ${OPENSSL_BUILD_OUTPUT})
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

-cmake_minimum_required(VERSION 3.31)
+cmake_minimum_required(VERSION 3.22)

 project(yuzu)

@@ -10,7 +10,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul

 set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_CXX_SCAN_FOR_MODULES 0)

 include(DetectPlatform)
 include(DetectArchitecture)
@@ -307,7 +306,7 @@ if (YUZU_ROOM)
    add_compile_definitions(YUZU_ROOM)
 endif()

-if (UNIX AND NOT (PLATFORM_LINUX OR WIN32))
+if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
    if(CXX_APPLE OR CXX_CLANG)
        # libc++ has stop_token and jthread as experimental
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
@@ -384,20 +383,13 @@ find_package(RenderDoc MODULE)
 # openssl funniness
 if (YUZU_USE_BUNDLED_OPENSSL)
    set(BUILD_SHARED_LIBS OFF)
-    AddJsonPackage(openssl-ci)
-else()
    AddJsonPackage(openssl)
-    set(OPENSSL_BUILD_VERBOSE ON)
-    set(OPENSSL_CONFIGURE_VERBOSE ON)
-
    if (OpenSSL_ADDED)
-        AddJsonPackage(openssl-cmake)
+        add_compile_definitions(YUZU_BUNDLED_OPENSSL)
    endif()
 endif()

-if (OpenSSL_ADDED)
-    add_compile_definitions(YUZU_BUNDLED_OPENSSL)
-endif()
+find_package(OpenSSL 3 REQUIRED)

 message(STATUS "Fetching needed dependencies with CPM")

@@ -513,7 +505,7 @@ endfunction()
 # =============================================

 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers)
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security)
        find_library(${fw}_LIBRARY ${fw} REQUIRED)
        list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
    endforeach()
@@ -525,8 +517,6 @@ elseif (WIN32)
        # PSAPI is the Process Status API
        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version crypt32 rpcrt4 gdi32 wldap32 mswsock)
    endif()
-elseif (PLATFORM_MANAGARM)
-    set(PLATFORM_LIBRARIES iconv intl)
 elseif (PLATFORM_HAIKU)
    # Haiku is so special :)
    set(PLATFORM_LIBRARIES bsd /boot/system/lib/libnetwork.so)
@@ -590,9 +580,9 @@ if (ENABLE_QT)
    if (YUZU_USE_BUNDLED_QT)
        # Qt 6.8+ is broken on macOS (??)
        if (APPLE)
-            AddQt(Eden-CI/Qt 6.7.3)
+            AddQt(6.7.3)
        else()
-            AddQt(Eden-CI/Qt 6.11.1)
+            AddQt(6.9.3)
        endif()
    else()
        message(STATUS "Using system Qt")
@@ -3,7 +3,7 @@

 set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)

-if(MSVC OR ANDROID OR IOS)
+if(MSVC OR ANDROID)
    set(BUNDLED_DEFAULT ON)
 else()
    set(BUNDLED_DEFAULT OFF)
@@ -247,9 +247,7 @@ function(AddJsonPackage)

    set(multiValueArgs OPTIONS)

-    set(options MODULE)
-
-    cmake_parse_arguments(JSON "${options}" "${oneValueArgs}" "${multiValueArgs}"
+    cmake_parse_arguments(JSON "" "${oneValueArgs}" "${multiValueArgs}"
        "${ARGN}")

    list(LENGTH ARGN argnLength)
@@ -279,10 +277,6 @@ function(AddJsonPackage)
    parse_object(${object})

    if(ci)
-        if (JSON_MODULE)
-            set(EXTRA_ARGS MODULE)
-        endif()
-
        AddCIPackage(
            VERSION ${version}
            NAME ${name}
@@ -290,8 +284,8 @@ function(AddJsonPackage)
            PACKAGE ${package}
            EXTENSION ${extension}
            MIN_VERSION ${min_version}
-            DISABLED_PLATFORMS ${disabled_platforms}
-            ${EXTRA_ARGS})
+            DISABLED_PLATFORMS ${disabled_platforms})
+
    else()
        if (NOT DEFINED JSON_FORCE_BUNDLED_PACKAGE)
            set(JSON_FORCE_BUNDLED_PACKAGE OFF)
@@ -696,10 +690,8 @@ function(AddCIPackage)
        set(pkgname linux-amd64)
    elseif(PLATFORM_LINUX AND ARCHITECTURE_arm64)
        set(pkgname linux-aarch64)
-    elseif(APPLE AND NOT IOS)
+    elseif(APPLE)
        set(pkgname macos-universal)
-    elseif(IOS AND ARCHITECTURE_arm64)
-        set(pkgname ios-aarch64)
    endif()

    if (DEFINED pkgname AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
@@ -732,11 +724,7 @@ function(AddCIPackage)
 endfunction()

 # Utility function for Qt
-function(AddQt repo version)
-    if (NOT DEFINED repo)
-        message(FATAL_ERROR "[CPMUtil] AddQt: repo is required")
-    endif()
-
+function(AddQt version)
    if (NOT DEFINED version)
        message(FATAL_ERROR "[CPMUtil] AddQt: version is required")
    endif()
@@ -746,7 +734,7 @@ function(AddQt repo version)
        PACKAGE Qt6
        VERSION ${version}
        MIN_VERSION 6
-        REPO ${repo}
+        REPO crueter-ci/Qt
        DISABLED_PLATFORMS
            android-x86_64 android-aarch64
            freebsd-amd64 solaris-amd64 openbsd-amd64
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -16,8 +13,7 @@ endif()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LLVM HANDLE_COMPONENTS CONFIG_MODE)

-# Demangle only for Windows targets
-if (WIN32 AND LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
+if (LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
    add_library(LLVM::Demangle INTERFACE IMPORTED)
    target_compile_definitions(LLVM::Demangle INTERFACE ${LLVM_DEFINITIONS})
    target_include_directories(LLVM::Demangle INTERFACE ${LLVM_INCLUDE_DIRS})
@@ -1,40 +1,12 @@
 {
-    "openssl-ci": {
+    "openssl": {
        "ci": true,
        "package": "OpenSSL",
        "name": "openssl",
        "repo": "crueter-ci/OpenSSL",
-        "version": "4.0.0-11b7b6ea3b",
+        "version": "3.6.0-1cb0d36b39",
        "min_version": "3"
    },
-    "openssl-cmake": {
-        "repo": "jimmy-park/openssl-cmake",
-        "hash": "2cc185c924fd70e7d886257ca0caa42b3b8f7f712f2052b4f94dde74759e27022de76178460e18c9bdfc57c366583999e198fbb6052d4e7d91c099d15a0ca63e",
-        "git_version": "3.6.2",
-        "tag": "%VERSION%",
-        "bundled": true,
-        "options": [
-            "OPENSSL_CONFIGURE_OPTIONS threads"
-        ],
-        "patches": [
-            "0001-cpmutil-compat.patch",
-            "0002-use-ccache.patch",
-            "0003-use-cmake-compiler-flags.patch",
-            "0004-use-shell-wrapper.patch"
-        ]
-    },
-    "openssl": {
-        "repo": "openssl/openssl",
-        "package": "OpenSSL",
-        "min_version": "3",
-        "version": "3",
-        "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a",
-        "git_version": "3.6.2",
-        "tag": "openssl-%VERSION%",
-        "patches": [
-            "0001-add-bundled-cert.patch"
-        ]
-    },
    "boost": {
        "package": "Boost",
        "repo": "boostorg/boost",
@@ -1,184 +0,0 @@
-; SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-; SPDX-License-Identifier: GPL-3.0-or-later
-
-; Usage:
-;   get the latest nsis: https://nsis.sourceforge.io/Download
-
-; Require these for makensis.
-!ifndef PRODUCT_VERSION
-  !error "PRODUCT_VERSION must be defined"
-!endif
-
-!ifndef ARCH
-  !error "ARCH must be defined"
-!endif
-
-!ifndef VARIANT
-  !error "VARIANT must be defined"
-!endif
-
-Unicode true
-ManifestDPIAware true
-
-!define PRODUCT_NAME "Eden"
-!define PRODUCT_PUBLISHER "Utopia LLC"
-!define PRODUCT_WEB_SITE "https://git.eden-emu.dev"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-
-!define BINARY_SOURCE_DIR "..\bin"
-
-Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}-Windows-${PRODUCT_VERSION}-${ARCH}-${VARIANT}-installer.exe"
-SetCompressor /SOLID lzma
-InstallDir "$LOCALAPPDATA\$(^Name)" 
-ShowInstDetails show
-ShowUnInstDetails show
-
-!include "MUI2.nsh"
-; Custom page plugin
-!include "nsDialogs.nsh"
-
-; MUI Settings
-!define MUI_ICON "eden.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-
-; License page
-!insertmacro MUI_PAGE_LICENSE "..\LICENSE.txt"
-; Desktop Shortcut page
-Page custom desktopShortcutPageCreate desktopShortcutPageLeave
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-!define MUI_FINISHPAGE_RUN "$INSTDIR\eden.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Variables
-Var DesktopShortcutPageDialog
-Var DesktopShortcutCheckbox
-Var DesktopShortcut
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "SimpChinese"
-!insertmacro MUI_LANGUAGE "TradChinese"
-!insertmacro MUI_LANGUAGE "Danish"
-!insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Hungarian"
-!insertmacro MUI_LANGUAGE "Italian"
-!insertmacro MUI_LANGUAGE "Japanese"
-!insertmacro MUI_LANGUAGE "Korean"
-!insertmacro MUI_LANGUAGE "Lithuanian"
-!insertmacro MUI_LANGUAGE "Norwegian"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-!insertmacro MUI_LANGUAGE "Romanian"
-!insertmacro MUI_LANGUAGE "Russian"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "Swedish"
-!insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "Vietnamese"
-
-; MUI end ------
-
-Function .onInit
-  StrCpy $DesktopShortcut 1
-
-  !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-Function desktopShortcutPageCreate
-  !insertmacro MUI_HEADER_TEXT "Create Desktop Shortcut" "Would you like to create a desktop shortcut?"
-  nsDialogs::Create 1018
-  Pop $DesktopShortcutPageDialog
-  ${If} $DesktopShortcutPageDialog == error
-    Abort
-  ${EndIf}
-
-  ${NSD_CreateCheckbox} 0u 0u 100% 12u "Create a desktop shortcut"
-  Pop $DesktopShortcutCheckbox
-  ${NSD_SetState} $DesktopShortcutCheckbox $DesktopShortcut
-
-  nsDialogs::Show
-FunctionEnd
-
-Function desktopShortcutPageLeave
-  ${NSD_GetState} $DesktopShortcutCheckbox $DesktopShortcut
-FunctionEnd
-
-Section "Base"
-  ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR'
-
-  SectionIn RO
-
-  SetOutPath "$INSTDIR"
-
-  ; The binplaced build output will be included verbatim.
-  File /r "${BINARY_SOURCE_DIR}\*"
-
-  ; Create start menu and desktop shortcuts
-  CreateShortCut "$SMPROGRAMS\$(^Name).lnk" "$INSTDIR\eden.exe"
-  ${If} $DesktopShortcut == 1
-    CreateShortCut "$DESKTOP\$(^Name).lnk" "$INSTDIR\eden.exe"
-  ${EndIf}
-SectionEnd
-
-!include "FileFunc.nsh"
-
-Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
-
-  WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\eden.exe"
-
-  ; Write metadata for add/remove programs applet
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\eden.exe"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "InstallLocation" "$INSTDIR"
-  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
-  IntFmt $0 "0x%08X" $0
-  WriteRegDWORD HKCU "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0"
-
-  WriteRegStr HKCU "Software\Classes\.nsp" "" "$(^Name)"
-  WriteRegStr HKCU "Software\Classes\.xci" "" "$(^Name)"
-  WriteRegStr HKCU "Software\Classes\.nro" "" "$(^Name)"
-  WriteRegStr HKCU "Software\Classes\.kip" "" "$(^Name)"
-  WriteRegStr HKCU "Software\Classes\$(^Name)\DefaultIcon" "" "$INSTDIR\eden.exe,0"
-  WriteRegStr HKCU "Software\Classes\$(^Name)\Shell\open\command" "" '"$INSTDIR\eden.exe" %1'
-SectionEnd
-
-Section Uninstall
-  Delete "$DESKTOP\$(^Name).lnk"
-  Delete "$SMPROGRAMS\$(^Name).lnk"
-
-  ; Be a bit careful to not delete files a user may have put into the install directory.
-  Delete "$INSTDIR\eden.exe"
-  Delete "$INSTDIR\eden-cli.exe"
-  Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\LICENSE.txt"
-  Delete "$INSTDIR\README.md"
-  RMDir /r "$INSTDIR\LICENSES"
-  RMDir "$INSTDIR"
-
-  DeleteRegKey HKCU "Software\Classes\.nsp"
-  DeleteRegKey HKCU "Software\Classes\.xci"
-  DeleteRegKey HKCU "Software\Classes\.nro"
-  DeleteRegKey HKCU "Software\Classes\.kip"
-  DeleteRegKey HKCU "Software\Classes\$(^Name)"
-
-  DeleteRegKey HKCU "Software\Classes\discord-1397286652128264252"
-
-  DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}"
-
-  SetAutoClose true
-SectionEnd
@@ -136,16 +136,6 @@ cmake -S . -B build -G "<GENERATOR>" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COM
 <img src="https://user-images.githubusercontent.com/42481638/216899275-d514ec6a-e563-470e-81e2-3e04f0429b68.png" width="500">
 </details>

-#### Option D: Visual Studio with clang-cl
-
-<details>
-1. Install `"x64 Native Tools Command Prompt"` for VS from the installer and also install `cmake-gui`.
-2. Open `"x64 Native Tools Command Prompt"` and type `cmake-gui`.
-3. Click configure choose ninja generator > specify native compilers.
-4. Put `"C:/Program Files/Microsoft Visual Studio/18/Community/VC/Tools/Llvm/x64/bin/clang-cl.exe"` as your C/C++ compiler path.
-5. Open `Visual studio > Open project` or Solution > Change to search for the CMake project file (`CMakeList.txt`) file on the cloned directory, and then build.
-</details>
-
 ## Troubleshooting

 If your initial configure failed:
@@ -18,4 +18,3 @@
  - `linux-amd64`
  - `linux-aarch64`
  - `macos-universal`
-  - `ios-aarch64`
@@ -61,8 +61,7 @@ In order: OpenSSL CI, Boost (tag + artifact), Opus (options + find_args), discor
        "version": "3.6.0",
        "min_version": "1.1.1",
        "disabled_platforms": [
-            "macos-universal",
-            "ios-aarch64"
+            "macos-universal"
        ]
    },
    "boost": {
@@ -69,6 +69,29 @@ Expressions can be `variable_names` or `1234` (numbers) or `*var` (dereference o

 For more information type `info gdb` and read [the man page](https://man7.org/linux/man-pages/man1/gdb.1.html).

-# RenderDoc (Graphic Debugging Tool)
+## Simple checklist for debugging black screens using Renderdoc

-Guidelines for graphical debugging using RenderDoc: **[RenderDoc usage](./RenderDoc.md)**
+Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it at [renderdoc.org](https://renderdoc.org).
+
+Before using renderdoc to diagnose issues, it is always good to make sure there are no validation errors. Any errors means the behavior of the application is undefined. That said, renderdoc can help debug validation errors if you do have them.
+
+When debugging a black screen, there are many ways the application could have setup Vulkan wrong.
+Here is a short checklist of items to look at to make sure are appropriate:
+
+- Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
+- Vertex buffers are bound
+- vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
+- Any bound push constants and descriptors have the right data - including:
+  - Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
+- Pipeline state is correct
+  - viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
+  - Fill mode matches expected - usually solid
+  - Culling mode makes sense - commonly back or none
+  - The winding direction is correct - typically CCW (counter clockwise)
+  - Scissor region is correct - usually same as viewport's x,y,width, &height
+- Blend state is correct
+- Depth state is correct - typically enabled with Function set to Less than or Equal
+- Swapchain images are bound when rendering to the swapchain
+- Image being rendered to is the same as the one being presented when rendering to the swapchain
+
+Alternatively, a [RenderDoc Extension](https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw) ([Archive](https://web.archive.org/web/20250000000000*/https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw)) exists which automates doing a lot of these manual steps.
@@ -16,7 +16,7 @@ To build Eden, you MUST have a C++ compiler.

 The following additional tools are also required:

-* **[CMake](https://www.cmake.org/)** 3.31+ - already included with the Android SDK
+* **[CMake](https://www.cmake.org/)** 3.22+ - already included with the Android SDK
 * **[Git](https://git-scm.com/)** for version control
  * **[Windows installer](https://gitforwindows.org)**
 * **[Python3](https://www.python.org/downloads/)** 3.10+ - necessary to download external repositories
@@ -1,6 +1,6 @@
 # HOS Kernel

-In brief, the HOS kernel is a microkernel, all services and programs run in userspace, the primary way to do communication between these is via `HIPC` (not covered here); otherwise most of the primitives reside in the forms of syscalls invoked via `svc #imm`. The kernel supports both 32-bit and 64-bit programs, and has the capacity to use 32, 36 and 39 bits of address space for spawned processes. Most of the networking stack is based off FreeBSD's network stack.
+In brief, the HOS kernel is a microkernel, some services and programs run in userspace, the primary way to do communication between these is via `HIPC` (not covered here); otherwise most of the primitives reside in the forms of syscalls invoked via `svc #imm`. The kernel supports both 32-bit and 64-bit programs, and has the capacity to use 32, 36 and 39 bits of address space for spawned processes. Most of the networking stack is based off FreeBSD's network stack.

 The emulator implements the majority of the syscalls pertaining to the HOS kernel itself. When we talk about the HOS Kernel (in the context of the emulator) we are strictly speaking about the mechanisms from which syscalls are handled (and it's subsequent side effects, such as the page table book-keeping). The emulator at it's current state is unable to load a custom low-level kernel and do supervisor-level emulation.

@@ -28,4 +28,4 @@ Every process keeps it's own tracking of the following structures:

 The emulator willingly restricts itself to only use 4 threads (to emulate 4 cores), this is because most existing applications do not benefit greatly from the added core count, and in fact can be detrimental due to extra contention. This translates equitatively to about 4 `ArmInterface` slots for each process, these are then redirected to whatever is the last `pc` of the last thread running on the core is meant to be; proceed to run it, then when returning (due to halt or interruption), proceed to reschedule the thread.

-The scheduler as-is isn't 100% faithful to the original (for example the original is cooperative and not preemptive), and has great timing variance (especially due to the fact the emulator can run in systems with wildly different timings).
+The scheduler as-is isn't 100% faithful to the original, and has great timing variance (especially due to the fact the emulator can run in systems with wildly different timings).
@@ -12,7 +12,6 @@ This contains documentation created by developers. This contains build instructi
 - **[Development Guidelines](./Development.md)**
 - **[Dependencies](./Deps.md)**
 - **[Debug Guidelines](./Debug.md)**
- **[RenderDoc usage](./RenderDoc.md)**
 - **[CPM - CMake Package Manager](./CPMUtil)**
 - **[Platform-Specific Caveats](./Caveats.md)**
 - **[The NVIDIA SM86 (Maxwell) GPU](./NvidiaGpu.md)**
@@ -1,52 +0,0 @@
-# RenderDoc
-
-Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it at [renderdoc.org](https://renderdoc.org).
-
-RenderDoc can capture Eden's Vulkan output when its Vulkan layer is loaded before Eden creates the Vulkan device. Before using renderdoc to diagnose issues, it is always good to make sure there are no validation errors. Any errors means the behavior of the application is undefined. That said, renderdoc can help debug validation errors if you do have them.
-
-## Usage on Windows 
-
-You can either use RenderDoc UI to launch eden, or you can make eden attach it internally:
-
-On Windows PowerShell:
-```powershell
-$env:ENABLE_VULKAN_RENDERDOC_CAPTURE='1'
-.\eden.exe
-```
-When RenderDoc is attached, Eden logs the default Windows capture folder:
-```text
-%LOCALAPPDATA%\Temp\RenderDoc
-```
-
-Press RenderDoc's capture hotkey, usually `F12`, to capture a frame. To stop using RenderDoc, close Eden and launch it again without `ENABLE_VULKAN_RENDERDOC_CAPTURE`.
-
-## Eden Hotkey
-
-Eden also has a separate `Toggle Renderdoc Capture` hotkey behind the debug setting `renderdoc_hotkey`.
-That hotkey does not load or unload RenderDoc. It only toggles Eden's own manual capture through RenderDoc's API:
-
- first press: starts a capture
- second press: ends that capture
-
-## Simple checklist for debugging black screens using Renderdoc
-
-When debugging a black screen, there are many ways the application could have setup Vulkan wrong.
-Here is a short checklist of items to look at to make sure are appropriate:
-
- Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
- Vertex buffers are bound
- vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
- Any bound push constants and descriptors have the right data - including:
-  - Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
- Pipeline state is correct
-  - viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
-  - Fill mode matches expected - usually solid
-  - Culling mode makes sense - commonly back or none
-  - The winding direction is correct - typically CCW (counter clockwise)
-  - Scissor region is correct - usually same as viewport's x,y,width, &height
- Blend state is correct
- Depth state is correct - typically enabled with Function set to Less than or Equal
- Swapchain images are bound when rendering to the swapchain
- Image being rendered to is the same as the one being presented when rendering to the swapchain
-
-Alternatively, a [RenderDoc Extension](https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw) ([Archive](https://web.archive.org/web/20250000000000*/https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw)) exists which automates doing a lot of these manual steps.
@@ -30,6 +30,7 @@ Before touching the settings, please see the game boots with stock options. We t

 ## CPU

+- `CPU/Virtual table bouncing`: Some games have the tendency to crash on loading due to an indirect bad jump (Pokemon ZA being the worst offender); this option lies to the game and tells it to just pretend it never executed a given function. This is fine for most casual users, but developers of switch applications **must** disable this. This temporary "hack" should hopefully be gone in 6-7 months from now on.
 - `Fastmem`, aka. `CPU/Enable Host MMU`: Enables "fastmem"; a detailed description of fastmem can be found [here](../dynarmic/Design.md#fast-memory-fastmem).
 - `CPU/Unsafe FMA`: Enables deliberate innacurate FMA behaviour which may affect how FMA returns any given operation - this may introduce tiny floating point errors which can cascade in sensitive code (i.e FFmpeg).
 - `CPU/Faster FRSQRTE and FRECPE`: Introduces accuracy errors on square root and reciprocals in exchange for less checks - this introduces inaccuracies with some cases but it's mostly safe.
@@ -49,8 +49,8 @@ if (NOT TARGET stb::headers)
    add_library(stb::headers ALIAS stb)
 endif()

-# ItaniumDemangle (Windows only)
-if (WIN32 AND NOT TARGET LLVM::Demangle)
+# ItaniumDemangle
+if (NOT TARGET LLVM::Demangle)
    add_library(demangle demangle/ItaniumDemangle.cpp)
    target_include_directories(demangle PUBLIC ./demangle)
    if (NOT MSVC)
@@ -82,11 +82,6 @@ if (ARCHITECTURE_riscv64)
    AddJsonPackage(biscuit)
 endif()

-# Lagoon
-if (ARCHITECTURE_loongarch64)
-    AddJsonPackage(lagoon)
-endif()
-
 # Vulkan stuff
 AddDependentPackages(vulkan-headers vulkan-utility-libraries)

@@ -9,7 +9,7 @@
    },
    "sirit": {
        "repo": "eden-emulator/sirit",
-        "git_version": "1.0.5",
+        "git_version": "1.0.4",
        "tag": "v%VERSION%",
        "artifact": "sirit-source-%VERSION%.tar.zst",
        "hash_suffix": "sha512sum",
@@ -23,16 +23,17 @@
        "package": "sirit",
        "name": "sirit",
        "repo": "eden-emulator/sirit",
-        "version": "1.0.5"
+        "version": "1.0.4"
    },
    "httplib": {
        "repo": "yhirose/cpp-httplib",
        "tag": "v%VERSION%",
-        "hash": "159ed94965018f2a371d45a3bfc1961e5fb1549e501ded70a6b4532d7fe99d0579c18b5195aff6e35f96f399b426cea2650ec9fb75ef80d4c9edeccb51f2e6c9",
-        "git_version": "0.46.0",
+        "hash": "5efa8140aadffe105dcf39935b732476e95755f6c7473ada3d0b64df2bc02c557633ae3948a25b45e1cf67e89a3ff6329fb30362e4ac033b9a1d1e453aa2eded",
+        "git_version": "0.37.0",
        "find_args": "MODULE GLOBAL",
        "patches": [
-            "0001-mingw.patch"
+            "0001-mingw.patch",
+            "0002-fix-zstd.patch"
        ],
        "options": [
            "HTTPLIB_REQUIRE_OPENSSL ON",
@@ -66,12 +67,6 @@
        "tag": "v%VERSION%",
        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856"
    },
-    "lagoon": {
-        "repo": "loongson-community/lagoon",
-        "tag": "%VERSION%",
-        "version": "1.0.0",
-        "hash": "b9380f99c6effaeccc6d8f81d4942e852c11ad28613df637e155451556ae5826f93765bee57a5c87a9740d2bd1db463ad0f55a947772fe9d57eeabae3efa373e"
-    },
    "libadrenotools": {
        "repo": "eden-emulator/libadrenotools",
        "sha": "8ba23b42d7",
@@ -59,7 +59,7 @@ endif()
 if (PLATFORM_PS4 OR PLATFORM_MANAGARM)
    # Doesn't support VA-API, don't go thru the embarrassment of trying to enable it
    list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
-elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING AND NOT ANDROID)
+elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING)
    find_package(PkgConfig REQUIRED)
    pkg_check_modules(LIBVA libva)
    pkg_check_modules(CUDA cuda)
@@ -169,7 +169,7 @@ if (PLATFORM_PS4)
    )
 elseif (PLATFORM_MANAGARM)
    # Required for proper stuff
-    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
+    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS 
        --disable-pthreads
        --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
    )
@@ -8,7 +8,7 @@
 include_directories(.)

 # Dynarmic
-if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64 OR ARCHITECTURE_loongarch64) AND NOT YUZU_STATIC_ROOM)
+if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64) AND NOT YUZU_STATIC_ROOM)
    add_subdirectory(dynarmic)
    add_library(dynarmic::dynarmic ALIAS dynarmic)
 endif()
@@ -21,41 +21,20 @@ if (YUZU_STATIC_BUILD)
    add_compile_definitions(QT_STATICPLUGIN)
 endif()

-# Build identifiers
 if (NIGHTLY_BUILD)
    add_compile_definitions(NIGHTLY_BUILD)
 endif()

-# Legacy (android only)
 if (YUZU_LEGACY)
    message(WARNING "Making legacy build. Performance may suffer.")
    add_compile_definitions(YUZU_LEGACY)
 endif()

-# Genshin Spoof (android only)
 if (GENSHIN_SPOOF)
    message(WARNING "Making Genshin spoof build")
    add_compile_definitions(GENSHIN_SPOOF)
 endif()

-# Build ID (mingw only right now)
-# Pretty much just refers to the CI "target" for this build
-if (NOT BUILD_ID)
-    if (ARCHITECTURE_x86_64)
-        set(BUILD_ID amd64)
-    elseif(ARCHITECTURE_arm64)
-        if (WIN32)
-            set(BUILD_ID arm64)
-        else()
-            set(BUILD_ID aarch64)
-        endif()
-    else()
-        set(BUILD_ID "${ARCHITECTURE}")
-    endif()
-endif()
-
-add_compile_definitions(BUILD_ID="${BUILD_ID}")
-
 # Set compilation flags
 if (MSVC AND NOT CXX_CLANG)
    set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)
@@ -256,7 +256,7 @@ android {

    externalNativeBuild {
        cmake {
-            version = "3.31.6"
+            version = "3.22.1"
            path = file("${edenDir}/CMakeLists.txt")
        }
    }
@@ -15,6 +15,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Rect
 import android.graphics.drawable.Icon
@@ -100,6 +101,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    private var romSwapGeneration = 0
    private var hasEmulationSession = processHasEmulationSession
    private val romSwapStopTimeoutRunnable = Runnable { onRomSwapStopTimeout() }
+    private val pictureInPictureFailureActions: MutableSet<String> = mutableSetOf()

    private fun onRomSwapStopTimeout() {
        if (!isWaitingForRomSwapStop) {
@@ -268,12 +270,18 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    }

    override fun onUserLeaveHint() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            if (BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && !isInPictureInPictureMode) {
-                val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-                    .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
-                enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
-            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ||
+            !isPictureInPictureSupported() ||
+            !BooleanSetting.PICTURE_IN_PICTURE.getBoolean() ||
+            isInPictureInPictureMode
+        ) {
+            return
+        }
+
+        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
+            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
+        runPictureInPictureAction("enter picture-in-picture mode") {
+            enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
        }
    }

@@ -653,7 +661,29 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
        return this.apply { setActions(pictureInPictureActions) }
    }

+    private fun isPictureInPictureSupported() =
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+            packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
+
+    private fun runPictureInPictureAction(actionName: String, action: () -> Unit) {
+        try {
+            action()
+        } catch (e: IllegalStateException) {
+            if (pictureInPictureFailureActions.add(actionName)) {
+                Log.warning("[PiP] Failed to $actionName: ${e.message}")
+            }
+        } catch (e: UnsupportedOperationException) {
+            if (pictureInPictureFailureActions.add(actionName)) {
+                Log.warning("[PiP] Failed to $actionName: ${e.message}")
+            }
+        }
+    }
+
    fun buildPictureInPictureParams() {
+        if (!isPictureInPictureSupported()) {
+            return
+        }
+
        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -663,7 +693,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
                BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && isEmulationActive
            )
        }
-        setPictureInPictureParams(pictureInPictureParamsBuilder.build())
+        runPictureInPictureAction("set picture-in-picture params") {
+            setPictureInPictureParams(pictureInPictureParamsBuilder.build())
+        }
    }

    fun displayMultiplayerDialog() {
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -11,7 +11,6 @@ import org.yuzu.yuzu_emu.utils.NativeConfig
 enum class StringSetting(override val key: String) : AbstractStringSetting {
    DRIVER_PATH("driver_path"),
    DEVICE_NAME("device_name"),
-    PROGRAM_ARGS("program_args"),

    WEB_TOKEN("eden_token"),
    WEB_USERNAME("eden_username")
@@ -125,13 +125,6 @@ abstract class SettingsItem(
        // List of all general
        val settingsItems = HashMap<String, SettingsItem>().apply {
            put(StringInputSetting(StringSetting.DEVICE_NAME, titleId = R.string.device_name))
-            put(
-                StringInputSetting(
-                    StringSetting.PROGRAM_ARGS,
-                    titleId = R.string.program_args,
-                    descriptionId = R.string.program_args_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.RENDERER_USE_SPEED_LIMIT,
@@ -1286,7 +1286,6 @@ class SettingsFragmentPresenter(
            add(HeaderSetting(R.string.general))

            add(ShortSetting.DEBUG_KNOBS.key)
-            add(StringSetting.PROGRAM_ARGS.key)

            add(HeaderSetting(R.string.gpu_logging_header))
            add(BooleanSetting.GPU_LOGGING_ENABLED.key)
@@ -33,5 +33,3 @@ if (ENABLE_UPDATE_CHECKER)
 endif()

 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android)
-
-target_link_options(yuzu-android PRIVATE "-Wl,-Bsymbolic")
@@ -462,8 +462,8 @@
    <string name="renderer_resolution">الدقة (الإرساء/محمول)</string>
    <string name="renderer_vsync">VSync وضع</string>
    <string name="renderer_scaling_filter">مرشح ملائم للنافذة</string>
-    <string name="fsr_sharpness">حدة FSR/SGSR</string>
-    <string name="fsr_sharpness_description">يحدد مدى وضوح الصورة عند استخدام مرشحات FSR أو SGSR</string>
+    <string name="fsr_sharpness">حدة FSR</string>
+    <string name="fsr_sharpness_description">يحدد مدى وضوح الصورة عند استخدام التباين الديناميكي لـ FSR</string>
    <string name="renderer_anti_aliasing">طريقة مضاد التعرج</string>


@@ -503,8 +503,6 @@
    <string name="fast_gpu_time_description">يُجبر هذا الخيار معظم الألعاب على العمل بأعلى دقة عرض أصلية. استخدم 256 للحصول على أقصى أداء و512 للحصول على أعلى جودة رسومات.</string>
    <string name="skip_cpu_inner_invalidation">تخطي إبطال صلاحية وحدة المعالجة المركزية الداخلية</string>
    <string name="skip_cpu_inner_invalidation_description">يتخطى بعض عمليات إبطال ذاكرة التخزين المؤقتة من جانب وحدة المعالجة المركزية أثناء تحديثات الذاكرة، مما يقلل من استخدام وحدة المعالجة المركزية ويحسن أداءها. قد يتسبب ذلك في حدوث أعطال أو تعطل في بعض الألعاب.</string>
-    <string name="antiflicker">مضاد الوميض</string>
-    <string name="antiflicker_description">يُجبر هذا الوضع وظائف وحدة معالجة الرسومات على الانتظار حتى يتم إرسال العمل إليها. استخدمه مع وضع وحدة معالجة الرسومات السريع لتجنب الوميض مع تأثير أقل على الأداء.</string>
    <string name="fix_bloom_effects">إصلاح تأثيرات التوهج</string>
    <string name="fix_bloom_effects_description">يقلل من ضبابية التوهج في LA/EOW  (Adreno A6XX - A7XX/ Turnip)، ويزيل التوهج في Burnout. تحذير: قد يسبب تشوهات رسومية في ألعاب أخرى.</string>
    <string name="emulate_bgr565">محاكاة BGR565</string>
@@ -329,6 +329,8 @@
    <string name="renderer_resolution">ڕوونی (دۆخی دەستی/دۆخی دۆک)</string>
    <string name="renderer_vsync">دۆخی VSync</string>
    <string name="renderer_scaling_filter">فلتەری گونجاندنی پەنجەرە</string>
+    <string name="fsr_sharpness">تیژی FSR</string>
+    <string name="fsr_sharpness_description">دیاریکردنی تیژی وێنە لە کاتی بەکارهێنانی FSR</string>
    <string name="renderer_anti_aliasing">شێوازی دژە-خاوڕۆیی</string>


@@ -439,6 +439,8 @@
    <string name="renderer_resolution">Rozlišení (Handheld/V doku)</string>
    <string name="renderer_vsync">Režim VSync</string>
    <string name="renderer_scaling_filter">Škálovací filtr</string>
+    <string name="fsr_sharpness">Ostrost FSR</string>
+    <string name="fsr_sharpness_description">Určuje jak ostře bude obraz vypadat při použití dynamického kontrastu FSR.</string>
    <string name="renderer_anti_aliasing">Metoda anti-aliasingu</string>


@@ -439,6 +439,8 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die
    <string name="renderer_resolution">Auflösung (Handheld/Gedockt)</string>
    <string name="renderer_vsync">VSync-Modus</string>
    <string name="renderer_scaling_filter">Skalierungsfilter</string>
+    <string name="fsr_sharpness">FSR-Schärfe</string>
+    <string name="fsr_sharpness_description">Bestimmt die Schärfe bei FSR-Nutzung.</string>
    <string name="renderer_anti_aliasing">Kantenglättung</string>


@@ -376,7 +376,7 @@
    <string name="qlaunch_applet">Qlaunch</string>
    <string name="qlaunch_description">Iniciar aplicaciones desde la pantalla de inicio del sistema</string>
    <string name="applets">Lanzador de Applet</string>
-    <string name="applets_description">Ejecutar applets del sistema usando el firmware instalado</string>
+    <string name="applets_description">Ejecutar applets de sistema usando el firmware instalado</string>
    <string name="applets_error_firmware">El firmware no está instalado</string>
    <string name="applets_error_applet">Applet no disponible</string>
    <string name="applets_error_description"><![CDATA[Por favor, asegúrese de que su archivo <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> y el <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-system-firmware\">firmware</a> están instalados e inténtelo de nuevo.]]></string>
@@ -456,8 +456,8 @@
    <string name="renderer_resolution">Resolución (Portátil/Sobremesa)</string>
    <string name="renderer_vsync">Modo de sincronización vertical</string>
    <string name="renderer_scaling_filter">Filtro de adaptación de ventana</string>
-    <string name="fsr_sharpness">Nitidez FSR/SGSR</string>
-    <string name="fsr_sharpness_description">Determina el grado de nitidez de la imagen al usar filtros FSR o SGSR</string>
+    <string name="fsr_sharpness">Nitidez FSR</string>
+    <string name="fsr_sharpness_description">Ajusta la intensidad del filtro de enfoque al usar el contraste dinámico de FSR.</string>
    <string name="renderer_anti_aliasing">Método de suavizado de bordes</string>


@@ -497,8 +497,6 @@
    <string name="fast_gpu_time_description">Fuerza a la mayoría de los juegos a ejecutarse a su resolución nativa más alta. Usa 256 para un máximo rendimiento y 512 para una fidelidad gráfica óptima.</string>
    <string name="skip_cpu_inner_invalidation">Omitir invalidación interna de la CPU</string>
    <string name="skip_cpu_inner_invalidation_description">Omite ciertas invalidaciones de caché de la CPU durante las actualizaciones de memoria, lo que reduce el uso de la CPU y mejora su rendimiento. Esto puede causar fallos o bloqueos en algunos juegos.</string>
-    <string name="antiflicker">Antiparpadeo</string>
-    <string name="antiflicker_description">Fuerza a las funciones de devolución de llamada de la GPU a esperar a que se envíen las tareas a la GPU.\nÚsalo con el modo de GPU rápida para evitar el parpadeo con un menor impacto en el rendimiento.</string>
    <string name="fix_bloom_effects">Arreglar los efectos de resplandor</string>
    <string name="fix_bloom_effects_description">Reduce el efecto de resplandor en LA/EOW (Adreno A6XX - A7XX/ Turnip), elimina el resplandor en Burnout. Advertencia: puede causar artefactos gráficos en otros juegos.</string>
    <string name="emulate_bgr565">Emular BGR565</string>
@@ -805,7 +803,7 @@
    <string name="select_content_type">Tipo de contenido</string>
    <string name="updates_and_dlc">Actualizaciones y contenido descargable</string>
    <string name="mods_and_cheats">Mods y trucos</string>
-    <string name="addon_notice">Aviso importante sobre los complementos</string>
+    <string name="addon_notice">Aviso importante de complementos</string>
    <!-- \"cheats/" "romfs/" and \"exefs/ should not be translated -->
    <string name="addon_notice_description">Para instalar mods y trucos, debe seleccionar una carpeta que contenga los directorios cheats/, romfs/, o exefs/ . ¡No podemos confirmar si éstos serán compatibles con su juego, así que tenga cuidado!</string>
    <string name="invalid_directory">Directorio no válido</string>
@@ -816,7 +814,7 @@
    <string name="content_install_notice">Aviso importante de contenido</string>
    <string name="content_install_notice_description">El contenido seleccionado no es de este juego.\n¿Instalar aun que\?</string>
    <string name="confirm_uninstall">Confirmar desinstalación</string>
-    <string name="confirm_uninstall_description">¿Estás seguro de que quieres desinstalar este complemento\?</string>
+    <string name="confirm_uninstall_description">¿Está seguro de que quiere desinstalar este complemento\?</string>
    <string name="verify_integrity">Verificar integridad</string>
    <string name="verifying">Verificando...</string>
    <string name="verify_success">¡La verificación de integridad ha sido un éxito!</string>
@@ -1074,7 +1072,7 @@

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Fondos oscuros</string>
-    <string name="use_black_backgrounds_description">Cuando se usa el modo oscuro, aplicar fondos de pantalla negros.</string>
+    <string name="use_black_backgrounds_description">Cuando utilice el modo oscuro, aplique fondos negros.</string>

    <!-- Buttons -->
    <string name="enable_folder_button">Carpeta</string>
@@ -454,6 +454,8 @@
    <string name="renderer_resolution">Résolution (Mode Portable/Mode TV)</string>
    <string name="renderer_vsync">Mode VSync</string>
    <string name="renderer_scaling_filter">Filtre de fenêtre adaptatif</string>
+    <string name="fsr_sharpness">Netteté FSR</string>
+    <string name="fsr_sharpness_description">Détermine à quel point l\'image sera affinée lors de l\'utilisation du contraste dynamique FSR.</string>
    <string name="renderer_anti_aliasing">Méthode d\'anticrénelage</string>


@@ -359,6 +359,8 @@
    <string name="renderer_resolution">רזולוציה (מעוגן/נייד)</string>
    <string name="renderer_vsync">מצב VSync</string>
    <string name="renderer_scaling_filter">פילטר מתאם חלון</string>
+    <string name="fsr_sharpness">חדות FSR</string>
+    <string name="fsr_sharpness_description">קובע את מידת החדות בעת שימוש ב-FSR.</string>
    <string name="renderer_anti_aliasing">שיטת Anti-aliasing</string>


@@ -348,6 +348,8 @@
    <string name="renderer_resolution">Felbontás (Kézi/Dockolt)</string>
    <string name="renderer_vsync">VSync mód</string>
    <string name="renderer_scaling_filter">Ablakhoz alkalmazkodó szűrő</string>
+    <string name="fsr_sharpness">FSR élesség</string>
+    <string name="fsr_sharpness_description">Meghatározza, milyen éles lesz a kép az FSR dinamikus kontraszt használata közben.</string>
    <string name="renderer_anti_aliasing">Élsimítási módszer</string>


@@ -380,6 +380,8 @@
    <string name="renderer_resolution">Resolusi (Handheld/Docked)</string>
    <string name="renderer_vsync">Mode Sinkronisasi Vertikal</string>
    <string name="renderer_scaling_filter">Filter penyesuaian jendela</string>
+    <string name="fsr_sharpness">Ketajaman FSR</string>
+    <string name="fsr_sharpness_description">Menentukan seberapa tajam gambar akan terlihat saat menggunakan kontras dinamis FSR</string>
    <string name="renderer_anti_aliasing">Metode anti-aliasing</string>


@@ -387,6 +387,8 @@
    <string name="renderer_resolution">Risoluzione (Portatile/Docked)</string>
    <string name="renderer_vsync">Modalità VSync</string>
    <string name="renderer_scaling_filter">Filtro adattivo della finestra </string>
+    <string name="fsr_sharpness">Nitidezza FSR</string>
+    <string name="fsr_sharpness_description">Determina quanto sarà nitida l\'immagine utilizzando il contrasto dinamico di FSR</string>
    <string name="renderer_anti_aliasing">Metodo di anti-aliasing</string>


@@ -329,6 +329,8 @@
    <string name="renderer_resolution">Oppløsning (håndholdt/dokket)</string>
    <string name="renderer_vsync">VSync-modus</string>
    <string name="renderer_scaling_filter">Filter for vindustilpasning</string>
+    <string name="fsr_sharpness">FSR-skarphet</string>
+    <string name="fsr_sharpness_description">Bestemmer bildekvalitet med FSR</string>
    <string name="renderer_anti_aliasing">Anti-aliasing-metode</string>


@@ -439,6 +439,8 @@
    <string name="renderer_resolution">Rozdzielczość (Handheld/Zadokowany)</string>
    <string name="renderer_vsync">Synchronizacja pionowa VSync</string>
    <string name="renderer_scaling_filter">Filtr adaptacji rozdzielczości</string>
+    <string name="fsr_sharpness">Ostrość FSR</string>
+    <string name="fsr_sharpness_description">Kontroluje ostrość obrazu w FSR.</string>
    <string name="renderer_anti_aliasing">Metoda wygładzania krawędzi</string>


@@ -430,6 +430,8 @@
    <string name="renderer_resolution">Resolução (Portátil/Modo TV)</string>
    <string name="renderer_vsync">Modo de VSync</string>
    <string name="renderer_scaling_filter">Filtro de Adaptação da Janela</string>
+    <string name="fsr_sharpness">Nitidez do FSR</string>
+    <string name="fsr_sharpness_description">Determina a nitidez da imagem ao utilizar o contraste dinâmico do FSR</string>
    <string name="renderer_anti_aliasing">Método de Anti-aliasing</string>


@@ -352,6 +352,8 @@
    <string name="renderer_resolution">Resolução (Portátil/Ancorado)</string>
    <string name="renderer_vsync">Modo VSync</string>
    <string name="renderer_scaling_filter">Filtro de Adaptação da Janela</string>
+    <string name="fsr_sharpness">Nitidez do FSR</string>
+    <string name="fsr_sharpness_description">Determina a nitidez da imagem ao usar contraste dinâmico do FSR</string>
    <string name="renderer_anti_aliasing">Método de Anti-Serrilhado</string>


@@ -458,8 +458,8 @@
    <string name="renderer_resolution">Разрешение (портативное/в док-станции)</string>
    <string name="renderer_vsync">Режим верт. синхронизации</string>
    <string name="renderer_scaling_filter">Фильтр адаптации окна</string>
-    <string name="fsr_sharpness">Резкость FSR/SGSR</string>
-    <string name="fsr_sharpness_description">Определяет, насколько чётким будет изображение при использовании динамического контраста FSR или SGSR фильтров</string>
+    <string name="fsr_sharpness">Резкость FSR</string>
+    <string name="fsr_sharpness_description">Определяет, насколько чётким будет изображение при использовании динамического контраста FSR.</string>
    <string name="renderer_anti_aliasing">Метод сглаживания</string>


@@ -499,8 +499,6 @@
    <string name="fast_gpu_time_description">Принудительно запускает большинство игр в их максимальном нативном разрешении. Используйте значение 256 для максимальной производительности и 512 для максимального качества графики.</string>
    <string name="skip_cpu_inner_invalidation">Пропустить внутреннюю инвалидацию ЦП</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускает некоторые инвалидации кэша на стороне ЦП при обновлениях памяти, уменьшая нагрузку на процессор и повышая производительность. Может вызывать сбои в некоторых играх.</string>
-    <string name="antiflicker">Анти-мерцание</string>
-    <string name="antiflicker_description">Принудительно заставляет обратные вызовы ГПУ-фильтра ожидать выполнения отправленных задач на ГПУ. Используйте с Быстрым режимом ГПУ, что бы избежать мерцаний с меньшим влиянием на производительность.</string>
    <string name="fix_bloom_effects">Исправить эффекты размытия</string>
    <string name="fix_bloom_effects_description">Частично убирает размытие в LA/EOW (Adreno A6XX - A7XX/ Turnip), полностью отключает его в Burnout. Внимание: может вызывать графические артефакты в других играх.</string>
    <string name="emulate_bgr565">Эмулировать BGR565</string>
@@ -351,6 +351,8 @@
    <string name="renderer_resolution">Резолуција (ручно / прикључено)</string>
    <string name="renderer_vsync">Всинц мод</string>
    <string name="renderer_scaling_filter">Филтер прилагођавања прозора</string>
+    <string name="fsr_sharpness">ФСР оштрина</string>
+    <string name="fsr_sharpness_description">Одређује колико ће се слика наоштрен трајати док користи \"ФСР\" динамички контраст</string>
    <string name="renderer_anti_aliasing">Метода против алиасирања</string>


@@ -458,8 +458,8 @@
    <string name="renderer_resolution">Роздільна здатність (Портативний/Док)</string>
    <string name="renderer_vsync">Режим верт. синхронізації</string>
    <string name="renderer_scaling_filter">Фільтр масштабування вікна</string>
-    <string name="fsr_sharpness">Різкість FSR/SGSR</string>
-    <string name="fsr_sharpness_description">Визначає різкість зображення при використанні фільтрів FSR або SGSR.</string>
+    <string name="fsr_sharpness">Різкість FSR</string>
+    <string name="fsr_sharpness_description">Визначає різкість зображення при використанні FSR.</string>
    <string name="renderer_anti_aliasing">Згладжування</string>


@@ -499,8 +499,6 @@
    <string name="fast_gpu_time_description">Примушує більшість ігор працювати на їхній максимальній нативній роздільності. Використовуйте 256 для максимальної продуктивності та 512 для найкращої якості.</string>
    <string name="skip_cpu_inner_invalidation">Пропустити внутрішнє інвалідування CPU</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускає деякі інвалідації кешу на стороні CPU під час оновлення пам\'яті, зменшуючи навантаження на процесор і покращуючи продуктивність. Може спричинити збої в деяких іграх.</string>
-    <string name="antiflicker">Антимерехтіння</string>
-    <string name="antiflicker_description">Змушує механізм синхронізації чекати, доки ГП завершить подані завдання. Використовуйте з режимом ГП «Швидко», щоб уникнути мерехтіння з меншими втратами продуктивності.</string>
    <string name="fix_bloom_effects">Виправити ефекти світіння</string>
    <string name="fix_bloom_effects_description">Зменшує розмиття світіння в LA/EOW (Adreno A6XX–A7XX / Turnip), прибирає світіння в Burnout. Увага: може спричинити графічні артефакти в інших іграх.</string>
    <string name="emulate_bgr565">Емулювати BGR565</string>
@@ -327,6 +327,8 @@
    <string name="renderer_resolution">Độ phân giải (Handheld/Docked)</string>
    <string name="renderer_vsync">Chế độ VSync</string>
    <string name="renderer_scaling_filter">Bộ lọc điều chỉnh cửa sổ</string>
+    <string name="fsr_sharpness">Độ sắc nét FSR</string>
+    <string name="fsr_sharpness_description">Độ sắc nét khi dùng FSR</string>
    <string name="renderer_anti_aliasing">Phương pháp khử răng cưa</string>


@@ -29,8 +29,8 @@
    <string name="overlay_auto_hide">触控叠加层自动隐藏</string>
    <string name="overlay_auto_hide_description">在指定时间内未进行任何操作后，自动隐藏触控叠加层。</string>
    <string name="enable_input_overlay_auto_hide">启用触控叠加层自动隐藏</string>
-    <string name="hide_overlay_on_controller_input">当使用控制器控制输入时隐藏触控叠加层</string>
-    <string name="hide_overlay_on_controller_input_description">在使用实体控制器时自动隐藏触控叠加层，而当控制器断开连接时，触控叠加层则会重新显现。</string>
+    <string name="hide_overlay_on_controller_input">使用控制器时隐藏触控叠加层</string>
+    <string name="hide_overlay_on_controller_input_description">在使用实体控制器时自动隐藏触控叠加层，而当控制器断开时触控叠加层则会重新显现。</string>
    <string name="invert_confirm_back_controller_buttons">切换“确认/返回”控制器按钮功能</string>
    <string name="invert_confirm_back_controller_buttons_description">在与本应用的界面交互时，交换 Android 的“确认”与“返回”按钮的处理方式，以匹配 Switch 和 Xbox 的风格。</string>

@@ -432,7 +432,7 @@

    <!-- CPU -->
    <string name="fast_cpu_time">CPU 超频</string>
-    <string name="fast_cpu_time_description">强制模拟的 CPU 以更高的时钟频率运行，从而消除某些帧率限制。使用“升频”（1700MHz）以在 Switch 的最高原生时钟频率运行，或使用“快速”（2000MHz）以 2 倍时钟频率运行。</string>
+    <string name="fast_cpu_time_description">强制模拟的 CPU 以更高的时钟频率运行，从而解除某些 FPS 限制器。使用 Boost (1700MHz) 可让游戏以 Switch 的最高原生时钟运行，或使用 Fast (2000MHz) 以 2 倍时钟运行。</string>
    <string name="custom_cpu_ticks">自定义CPU时钟</string>
    <string name="custom_cpu_ticks_description">设置自定义的CPU时钟值。更高的值可能提高性能，但也可能导致游戏卡顿。建议范围为77-21000。</string>
    <string name="cpu_ticks">时钟</string>
@@ -452,23 +452,23 @@
    <string name="renderer_resolution">分辨率 (掌机模式/主机模式)</string>
    <string name="renderer_vsync">垂直同步模式</string>
    <string name="renderer_scaling_filter">窗口滤镜</string>
-    <string name="fsr_sharpness">FSR/SGSR 锐度</string>
-    <string name="fsr_sharpness_description">确定在使用 FSR 或 SGSR 过滤器时的图像锐度</string>
+    <string name="fsr_sharpness">FSR 锐化度</string>
+    <string name="fsr_sharpness_description">确定使用 FSR 的动态对比度功能时的图像锐化程度</string>
    <string name="renderer_anti_aliasing">抗锯齿方式</string>


    <string name="advanced">高级</string>

    <string name="renderer_accuracy">GPU 模式</string>
-    <string name="renderer_accuracy_description">控制 GPU 模拟模式。大多数游戏在“快速”或“平衡”模式下都能正常渲染，但有些游戏仍需使用“精确”模式。粒子效果通常只有在“精确”模式下才能正确渲染。</string>
+    <string name="renderer_accuracy_description">控制 GPU 模拟的精确度。大部分游戏在性能或平衡模式下可以正常渲染，但部分游戏需要设置为精确。粒子效果通常只有在精确模式下才能正确显示。</string>
    <string name="dma_accuracy">DMA 精度</string>
-    <string name="dma_accuracy_description">控制 DMA 的精准度。安全精度可以修复存在于某些游戏中的问题，但在某些情况下也会对性能造成影响。如不确定，请保持“默认”。</string>
+    <string name="dma_accuracy_description">控制 DMA 精度。安全精度可以修复某些游戏中的问题，但在某些情况下也可能影响性能。如果不确定，请保留为“默认”。</string>
    <string name="anisotropic_filtering">各向异性过滤</string>
    <string name="anisotropic_filtering_description">提高斜角的纹理质量</string>
    <string name="vram_usage_mode">显存使用模式</string>
    <string name="vram_usage_mode_description">控制显存分配策略</string>
    <string name="accelerate_astc">ASTC解码方式</string>
-    <string name="accelerate_astc_description">选择渲染时使用的 ASTC 压缩纹理解码方式：CPU（缓慢，安全），GPU（快速，推荐），或 CPU 异步（无卡顿，但可能导致问题）</string>
+    <string name="accelerate_astc_description">选择ASTC压缩纹理的解码方式：CPU（慢速、安全）、GPU（快速、推荐）或CPU异步（无卡顿，可能导致问题）</string>

    <string name="sync_memory_operations">同步内存操作</string>
    <string name="sync_memory_operations_description">确保计算和内存操作之间的数据一致性。 此选项应能修复某些游戏中的问题，但在某些情况下可能会降低性能。 使用Unreal Engine 4的游戏似乎受影响最大。</string>
@@ -477,11 +477,11 @@
    <string name="renderer_force_max_clock">强制最大时钟 (仅限 Adreno)</string>
    <string name="renderer_force_max_clock_description">强制 GPU 以最大时钟运行 (温控依然生效)。</string>
    <string name="renderer_asynchronous_gpu_emulation">GPU 异步模拟</string>
-    <string name="renderer_asynchronous_gpu_emulation_description">此技巧可通过异步运行 GPU 模拟来提升性能，但在执行与时序相关的操作时，可能带来图形显示问题以及增加崩溃概率。</string>
+    <string name="renderer_asynchronous_gpu_emulation_description">此技巧可通过异步运行 GPU 模拟来提升性能，但在执行与时序相关的操作时，可能引入图形问题和增加崩溃概率。</string>
    <string name="renderer_async_presentation">异步呈现</string>
-    <string name="renderer_async_presentation_description">此技巧通过将图形呈现移至独立的 CPU 线程来提升性能，但可能会带来图形显示问题。</string>
+    <string name="renderer_async_presentation_description">此技巧通过将图形呈现移至独立的 CPU 线程来提升性能，但可能会引入图形显示问题。</string>
    <string name="renderer_reactive_flushing">启用反应性刷新</string>
-    <string name="renderer_reactive_flushing_description">通过牺牲性能来提升某些游戏的渲染精度。</string>
+    <string name="renderer_reactive_flushing_description">通过牺牲性能来提高某些游戏的渲染精度。</string>
    <string name="enable_buffer_history">启用缓冲区历史</string>
    <string name="enable_buffer_history_description">启用对先前缓冲区状态的访问。此选项可在某些游戏中提升渲染质量并保持性能的一致性。</string>
    <string name="use_optimized_vertex_buffers">优化顶点缓冲区</string>
@@ -489,29 +489,27 @@

    <string name="hacks">Hacks</string>

-    <string name="fast_gpu_time">快速 GPU 时间</string>
+    <string name="fast_gpu_time">GPU 超频频率</string>
    <string name="fast_gpu_time_description">强制大多数游戏以其最高原生分辨率运行。设置为 256 可获得最佳性能，设置为 512 可获得最佳画面保真度。</string>
    <string name="skip_cpu_inner_invalidation">跳过CPU内部无效化</string>
-    <string name="skip_cpu_inner_invalidation_description">在更新内存时跳过某些 CPU 端的缓存失效操作，从而降低 CPU 占用率并提升性能。可能会在某些游戏中引发故障点或崩溃。</string>
-    <string name="antiflicker">防闪烁</string>
-    <string name="antiflicker_description">强制 GPU 围栏回调等待已提交的 GPU 任务。配合“快速 GPU 模式”一起使用，以避免画面闪烁现象，仅会牺牲少量性能。</string>
+    <string name="skip_cpu_inner_invalidation_description">在内存更新期间跳过某些CPU端缓存无效化，减少CPU使用率并提高其性能。可能会导致某些游戏出现故障或崩溃。</string>
    <string name="fix_bloom_effects">修复 Bloom 效果</string>
-    <string name="fix_bloom_effects_description">减少《智慧的再现》和《众神的三角力量2》（Adreno A6XX - A7XX/ Turnip）中的 bloom 模糊，并移除《Burnout》中的 bloom 效果。警告：可能会导致在其他游戏中出现图形异常。</string>
+    <string name="fix_bloom_effects_description">减少《塞尔达传说：智慧的再现》（Adreno A6XX - A7XX/ Turnip）中的 bloom 模糊，并移除《Burnout》中的 bloom 效果。警告：可能会导致在其他游戏中出现图形异常。</string>
    <string name="emulate_bgr565">模拟 BGR565</string>
    <string name="emulate_bgr565_description">修复游戏中的颜色反转或是异常的画面瑕疵或阴影问题</string>
    <string name="rescale_hack">启用旧版缩放处理</string>
    <string name="rescale_hack_description">启用通过使用快速缩放路径，来为游戏提供缩放配置处理的传统处理方式</string>
    <string name="renderer_asynchronous_shaders">使用异步着色器</string>
-    <string name="renderer_asynchronous_shaders_description">以异步方式编译着色器。采用此方式或可减少卡顿，但也可能引入故障点。</string>
-    <string name="gpu_unswizzle_settings">GPU Unswizzle 设置</string>
-    <string name="gpu_unswizzle_settings_description">配置基于 GPU 的纹理 unswizzling 参数，或完全禁用该功能。通过调整这些设置，以尝试在性能与纹理加载质量之间取得平衡。</string>
-    <string name="gpu_unswizzle_enable">启用 GPU Unswizzle</string>
+    <string name="renderer_asynchronous_shaders_description">异步编译着色器。这可能会减少卡顿，但也可能会导致图形错误。</string>
+    <string name="gpu_unswizzle_settings">GPU 还原设置</string>
+    <string name="gpu_unswizzle_settings_description">配置基于 GPU 的纹理还原参数，或将其完全禁用。调整这些设置以平衡性能与纹理加载质量。</string>
+    <string name="gpu_unswizzle_enable">启用 GPU 还原</string>
    <string name="gpu_unswizzle_disabled">禁用</string>
-    <string name="gpu_unswizzle_texture_size">GPU Unswizzle 最大纹理尺寸</string>
-    <string name="gpu_unswizzle_texture_size_description">设置基于 GPU 的纹理 unswizzling 的最大尺寸（MB）。虽然 GPU 处理中等和大型纹理的速度更快，但对于非常小的纹理，CPU 可能更为高效。通过调节此项设置，以尝试在 GPU 加速与 CPU 开销之间找到平衡。</string>
-    <string name="gpu_unswizzle_stream_size">GPU Unswizzle 流大小</string>
-    <string name="gpu_unswizzle_stream_size_description">设置用于 unswizzling 大型纹理时的每帧数据限制。较高的数值可以加速纹理的加载过程，但会带来更高的帧延迟。而较低的数值则可以降低 GPU 的开销，但也可能会导致可见的纹理闪现。</string>
-    <string name="gpu_unswizzle_chunk_size">GPU Unswizzle 块大小</string>
+    <string name="gpu_unswizzle_texture_size">GPU 还原最大纹理尺寸</string>
+    <string name="gpu_unswizzle_texture_size_description">设置基于 GPU 的纹理还原的最大尺寸（单位：MiB）。\n虽然 GPU 在处理中型和大型纹理时速度更快，但对于非常小的纹理，CPU 的效率可能更高。\n调整此设置，以便在 GPU 加速和 CPU 开销之间找到最佳平衡点。</string>
+    <string name="gpu_unswizzle_stream_size">GPU 还原流大小</string>
+    <string name="gpu_unswizzle_stream_size_description">设置用于 unswizzling 大型纹理时的每帧数据限制。较高的数值可以加快纹理的加载速度，但会增加帧延迟。而较低的数值可以降低 GPU 的开销，但可能会导致可见的纹理 闪现。</string>
+    <string name="gpu_unswizzle_chunk_size">GPU 还原块大小</string>
    <string name="gpu_unswizzle_chunk_size_description">定义了 3D 纹理每批次处理的深度切片数量。增加此数值可在高性能 GPU 上提升吞吐效率，但在性能较弱的硬件上可能会导致卡顿或驱动超时。</string>
    <string name="gpu_unswizzle_default_button">默认</string>

@@ -524,7 +522,7 @@
    <string name="vertex_input_dynamic_state">顶点输入动态状态</string>
    <string name="vertex_input_dynamic_state_description">启用此功能可实现更灵活的顶点输入处理，可能减少顶点/缓冲区的管线编译时间。</string>
    <string name="sample_shading_fraction">采样着色</string>
-    <string name="sample_shading_fraction_description">允许片段着色器在多采样片段中对每个采样点执行一次操作，而非对每个片段执行一次。在提升图形显示质量的同时，会牺牲一部分性能。</string>
+    <string name="sample_shading_fraction_description">允许片段着色器在多采样片段中每个样本执行一次，而不是每个片段执行一次。以提高性能为代价改善图形质量。</string>


    <string name="display">显示</string>
@@ -548,7 +546,7 @@
    <string name="renderer_debug_description">将图形 API 设置为较慢的调试模式。</string>
    <string name="patch_old_qcom_drivers">BCn 纹理补丁</string>
    <string name="patch_old_qcom_drivers_description">在 Adreno GPU 上覆盖自动 BCn 纹理格式检测。通常根据 Android 版本自动检测（在 API 28 及以上启用）。</string>
-    <string name="fastmem">Fastmem</string>
+    <string name="fastmem">Fastmem 内存访问</string>

    <string name="log">日志记录</string>
    <string name="flush_by_line">按行刷新调试日志</string>
@@ -615,7 +613,7 @@
    <string name="unused">未使用</string>
    <string name="input_mapping_filter">输入映射过滤器</string>
    <string name="input_mapping_filter_description">选择一个设备过滤输入映射</string>
-    <string name="auto_map">自动映射控制器键位</string>
+    <string name="auto_map">控制器自动映射</string>
    <string name="auto_map_description">选择一个设备以尝试自动映射</string>
    <string name="attempted_auto_map">尝试为 %1$s 自动映射</string>
    <string name="controller_type">控制器类型</string>
@@ -731,10 +729,10 @@
    <string name="preferences_audio">声音</string>
    <string name="preferences_audio_description">输出引擎及音量</string>
    <string name="preferences_controls">控制</string>
-    <string name="preferences_controls_description">映射控制器键位输入</string>
+    <string name="preferences_controls_description">使用控制器来映射输入</string>
    <string name="preferences_player">玩家 %d</string>
    <string name="preferences_debug">调试</string>
-    <string name="preferences_debug_description">CPU/GPU 调试、图形 API 以及 fastmem</string>
+    <string name="preferences_debug_description">CPU/GPU 调试、图形 API 及 fastmem 内存访问</string>
    <string name="preferences_custom_paths">自定义路径</string>
    <string name="preferences_custom_paths_description">存档目录</string>

@@ -878,15 +876,15 @@
    <string name="emulation_rel_stick_center">相对摇杆中心</string>
    <string name="emulation_dpad_slide">十字方向键滑动</string>
    <string name="emulation_haptics">触觉反馈</string>
-    <string name="emulation_show_overlay">显示触控叠加层</string>
-    <string name="emulation_hide_overlay">隐藏触控叠加层</string>
+    <string name="emulation_show_overlay">显示控制器</string>
+    <string name="emulation_hide_overlay">隐藏控制器</string>
    <string name="emulation_toggle_all">全部切换</string>
    <string name="emulation_control_adjust">调整触控叠加层</string>
    <string name="emulation_control_scale">缩放</string>
    <string name="emulation_control_opacity">不透明度</string>
    <string name="emulation_touch_overlay_reset">重置触控叠加层</string>
    <string name="emulation_touch_overlay_edit">编辑触控叠加层</string>
-    <string name="emulation_snap_to_grid">对齐到网格</string>
+    <string name="emulation_snap_to_grid">截图到网格</string>
    <string name="emulation_pause">暂停模拟</string>
    <string name="emulation_unpause">继续模拟</string>
    <string name="emulation_input_overlay">触控叠加层选项</string>
@@ -982,7 +980,7 @@
    <string name="renderer_none">无</string>

    <!-- Renderer Accuracy -->
-    <string name="renderer_accuracy_low">快速</string>
+    <string name="renderer_accuracy_low">性能</string>
    <string name="renderer_accuracy_medium">平衡</string>
    <string name="renderer_accuracy_high">精确</string>

@@ -437,6 +437,8 @@
    <string name="renderer_resolution">解析度 (手提/底座)</string>
    <string name="renderer_vsync">垂直同步</string>
    <string name="renderer_scaling_filter">視窗適應過濾器</string>
+    <string name="fsr_sharpness">FSR 銳化度</string>
+    <string name="fsr_sharpness_description">使用 FSR 時圖片的銳化程度</string>
    <string name="renderer_anti_aliasing">抗鋸齒</string>


@@ -434,9 +434,6 @@
    <string name="cpu_accuracy">CPU accuracy</string>
    <string name="value_with_units">%1$s%2$s</string>

-    <string name="program_args">Homebrew Args</string>
-    <string name="program_args_description">Command-line arguments passed to homebrew at launch (e.g. -noglsl).</string>
-
    <!-- System settings strings -->
    <string name="device_name">Device name</string>
    <string name="use_docked_mode">Docked Mode</string>
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -177,8 +177,10 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
            queued_buffers.store(0);
            release_cv.notify_one();
        }
+
+        static constexpr std::array<s16, 6> silence{};
        for (size_t i = 0; i < num_frames; i++)
-            std::memset(&output_buffer[i * frame_size], 0, frame_size_bytes);
+            std::memcpy(&output_buffer[i * frame_size], silence.data(), frame_size_bytes);
        return;
    }

@@ -141,12 +141,12 @@ add_library(
    vector_math.h
    virtual_buffer.cpp
    virtual_buffer.h
+    wall_clock.cpp
+    wall_clock.h
    zstd_compression.cpp
    zstd_compression.h
    fs/ryujinx_compat.h fs/ryujinx_compat.cpp
    fs/symlink.h fs/symlink.cpp
-    cpu_features.cpp
-    cpu_features.h
    httplib.h
    net/net.h net/net.cpp)

@@ -180,7 +180,10 @@ endif()
 if(ARCHITECTURE_x86_64)
    target_sources(
        common
-        PRIVATE
+        PRIVATE x64/cpu_detect.cpp
+        x64/cpu_detect.h
+        x64/cpu_wait.cpp
+        x64/cpu_wait.h
        x64/rdtsc.cpp
        x64/rdtsc.h
        x64/xbyak.h)
@@ -231,11 +234,11 @@ if(CXX_CLANG)
 endif()

 if (BOOST_NO_HEADERS)
-    target_link_libraries(common PUBLIC Boost::algorithm Boost::heap Boost::icl Boost::pool)
+    target_link_libraries(common PUBLIC Boost::algorithm Boost::icl Boost::pool)
 else()
    target_link_libraries(common PUBLIC Boost::headers)
 endif()
-target_link_libraries(common PRIVATE OpenSSL::SSL)
+
 target_link_libraries(common PUBLIC Boost::filesystem Boost::context httplib::httplib nlohmann_json::nlohmann_json)

 if (lz4_ADDED)
@@ -243,12 +246,7 @@ if (lz4_ADDED)
 endif()

 target_link_libraries(common PUBLIC fmt::fmt stb::headers Threads::Threads unordered_dense::unordered_dense)
-target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd)
-
-# Please refer to src/common/demangle.cpp
-if (WIN32)
-    target_link_libraries(common PRIVATE LLVM::Demangle)
-endif()
+target_link_libraries(common PRIVATE lz4::lz4 LLVM::Demangle zstd::zstd)

 if(ANDROID)
    # For ASharedMemory_create
@@ -1,12 +1,7 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2005-2014 Daniel James
 // SPDX-FileCopyrightText: 2016 Austin Appleby
 // SPDX-License-Identifier: BSL-1.0

-#pragma once
-
 #include <array>
 #include <climits>
 #include <cstdint>
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -6,44 +6,30 @@

 #include <string>
 #include <string_view>
-#ifdef _WIN32
 #include <llvm/Demangle/Demangle.h>
-#else
-#include <cxxabi.h>
-#endif
-#include "common/demangle.h"

-static bool IsItanium(std::string_view name) {
-    // A valid Itanium encoding requires 1-4 leading underscores, followed by 'Z'.
-    auto const pos = name.find_first_not_of('_');
-    return pos > 0 && pos <= 4 && pos < name.size() && name[pos] == 'Z';
-}
+#include "common/demangle.h"
+#include "common/scope_exit.h"

 namespace Common {
+
 std::string DemangleSymbol(const std::string& mangled) {
    if (mangled.size() > 0) {
-        if (IsItanium(mangled)) {
-#ifdef _WIN32
-            // requires the use of llvm
+        auto const is_itanium = [](std::string_view name) -> bool {
+            // A valid Itanium encoding requires 1-4 leading underscores, followed by 'Z'.
+            auto const pos = name.find_first_not_of('_');
+            return pos > 0 && pos <= 4 && pos < name.size() && name[pos] == 'Z';
+        };
+        std::string ret = mangled;
+        if (is_itanium(mangled)) {
            if (char* p = llvm::itaniumDemangle(mangled); p != nullptr) {
-                std::string ret = std::string{p};
+                ret = std::string{p};
                std::free(p);
-                return ret;
            }
-#else
-            // can safely use libc++ and glibcxx provided demangling functions
-            // it's available since 2008(!) so no system should have issues with it
-            // see https://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.3/a01696.html
-            int status;
-            if (char* p = abi::__cxa_demangle(mangled.c_str(), NULL, NULL, &status); p != nullptr) {
-                std::string ret = std::string{p};
-                std::free(p);
-                return ret;
-            }
-#endif
        }
-        return mangled;
+        return ret;
    }
    return std::string{};
 }
+
 } // namespace Common
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
@@ -33,7 +30,7 @@ std::string NativeErrorToString(int e) {
    return ret;
 #else
    char err_str[255];
-#if defined(__ANDROID__) ||                                                                            \
+#if defined(ANDROID) ||                                                                            \
    (defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600)))
    // Thread safe (GNU-specific)
    const char* str = strerror_r(e, err_str, sizeof(err_str));
@@ -9,7 +9,7 @@
 #include "common/assert.h"
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
-#ifdef __ANDROID__
+#ifdef ANDROID
 #include "common/fs/fs_android.h"
 #endif
 #include "common/logging.h"
@@ -259,7 +259,7 @@ void IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, File
    } else {
        _wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type));
    }
-#elif __ANDROID__
+#elif ANDROID
    if (Android::IsContentUri(path)) {
        ASSERT_MSG(mode == FileAccessMode::Read, "Content URI file access is for read-only!");
        const auto fd = Android::OpenContentUri(path, Android::OpenMode::Read);
@@ -396,7 +396,7 @@ u64 IOFile::GetSize() const {
    // Flush any unwritten buffered data into the file prior to retrieving the file size.
    std::fflush(file);

-#ifdef __ANDROID__
+#if ANDROID
    u64 file_size = 0;
    if (Android::IsContentUri(file_path)) {
        file_size = Android::GetSize(file_path);
@@ -6,7 +6,7 @@

 #include "common/fs/file.h"
 #include "common/fs/fs.h"
-#ifdef __ANDROID__
+#ifdef ANDROID
 #include "common/fs/fs_android.h"
 #endif
 #include "common/fs/path_util.h"
@@ -409,62 +409,107 @@ bool RenameDir(const fs::path& old_path, const fs::path& new_path) {
    return true;
 }

-void IterateDirEntries(const std::filesystem::path& path, const DirEntryCallable& callback, DirEntryFilter filter) {
+void IterateDirEntries(const std::filesystem::path& path, const DirEntryCallable& callback,
+                       DirEntryFilter filter) {
    if (!ValidatePath(path)) {
        LOG_ERROR(Common_Filesystem, "Input path is not valid, path={}", PathToUTF8String(path));
        return;
    }
+
    if (!Exists(path)) {
-        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} does not exist", PathToUTF8String(path));
-        return;
-    }
-    if (!IsDir(path)) {
-        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} is not a directory", PathToUTF8String(path));
+        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} does not exist",
+                  PathToUTF8String(path));
+        return;
+    }
+
+    if (!IsDir(path)) {
+        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} is not a directory",
+                  PathToUTF8String(path));
        return;
    }

-    std::error_code ec;
    bool callback_error = false;
-    for (auto const& entry : fs::directory_iterator(path, ec)) {
-        if ((True(filter & DirEntryFilter::File) && entry.status().type() == fs::file_type::regular)
-        || (True(filter & DirEntryFilter::Directory) && entry.status().type() == fs::file_type::directory)) {
+
+    std::error_code ec;
+
+    for (const auto& entry : fs::directory_iterator(path, ec)) {
+        if (ec) {
+            break;
+        }
+
+        if (True(filter & DirEntryFilter::File) &&
+            entry.status().type() == fs::file_type::regular) {
            if (!callback(entry)) {
                callback_error = true;
+                break;
+            }
+        }
+
+        if (True(filter & DirEntryFilter::Directory) &&
+            entry.status().type() == fs::file_type::directory) {
+            if (!callback(entry)) {
+                callback_error = true;
+                break;
            }
        }
    }

    if (callback_error || ec) {
-        LOG_ERROR(Common_Filesystem, "Failed to visit all the directory entries of path={}, ec_message={}, callback_error={}", PathToUTF8String(path), ec.message(), callback_error);
-    } else {
-        LOG_DEBUG(Common_Filesystem, "Visited all the directory entries of path={}", PathToUTF8String(path));
+        LOG_ERROR(Common_Filesystem,
+                  "Failed to visit all the directory entries of path={}, ec_message={}",
+                  PathToUTF8String(path), ec.message());
+        return;
    }
+
+    LOG_DEBUG(Common_Filesystem, "Successfully visited all the directory entries of path={}",
+              PathToUTF8String(path));
 }

-void IterateDirEntriesRecursively(const std::filesystem::path& path, const DirEntryCallable& callback, DirEntryFilter filter) {
+void IterateDirEntriesRecursively(const std::filesystem::path& path,
+                                  const DirEntryCallable& callback, DirEntryFilter filter) {
    if (!ValidatePath(path)) {
        LOG_ERROR(Common_Filesystem, "Input path is not valid, path={}", PathToUTF8String(path));
        return;
    }
+
    if (!Exists(path)) {
-        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} does not exist", PathToUTF8String(path));
-        return;
-    }
-    if (!IsDir(path)) {
-        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} is not a directory", PathToUTF8String(path));
+        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} does not exist",
+                  PathToUTF8String(path));
+        return;
+    }
+
+    if (!IsDir(path)) {
+        LOG_ERROR(Common_Filesystem, "Filesystem object at path={} is not a directory",
+                  PathToUTF8String(path));
        return;
    }

-    // TODO (Morph): Replace this with recursive_directory_iterator once it's fixed in MSVC.
-    std::error_code ec;
    bool callback_error = false;
+
+    std::error_code ec;
+
+    // TODO (Morph): Replace this with recursive_directory_iterator once it's fixed in MSVC.
    for (const auto& entry : fs::directory_iterator(path, ec)) {
-        if ((True(filter & DirEntryFilter::File) && entry.status().type() == fs::file_type::regular)
-        || (True(filter & DirEntryFilter::Directory) && entry.status().type() == fs::file_type::directory)) {
+        if (ec) {
+            break;
+        }
+
+        if (True(filter & DirEntryFilter::File) &&
+            entry.status().type() == fs::file_type::regular) {
            if (!callback(entry)) {
                callback_error = true;
+                break;
            }
        }
+
+        if (True(filter & DirEntryFilter::Directory) &&
+            entry.status().type() == fs::file_type::directory) {
+            if (!callback(entry)) {
+                callback_error = true;
+                break;
+            }
+        }
+
        // TODO (Morph): Remove this when MSVC fixes recursive_directory_iterator.
        // recursive_directory_iterator throws an exception despite passing in a std::error_code.
        if (entry.status().type() == fs::file_type::directory) {
@@ -473,17 +518,21 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path, const DirEn
    }

    if (callback_error || ec) {
-        LOG_ERROR(Common_Filesystem, "Failed to visit all the directory entries of path={}, ec_message={}, callback_error={}", PathToUTF8String(path), ec.message(), callback_error);
-    } else {
-        LOG_DEBUG(Common_Filesystem, "Visited all the directory entries of path={}", PathToUTF8String(path));
+        LOG_ERROR(Common_Filesystem,
+                  "Failed to visit all the directory entries of path={}, ec_message={}",
+                  PathToUTF8String(path), ec.message());
+        return;
    }
+
+    LOG_DEBUG(Common_Filesystem, "Successfully visited all the directory entries of path={}",
+              PathToUTF8String(path));
 }

 // Generic Filesystem Operations

 bool Exists(const fs::path& path) {
    std::error_code ec;
-#ifdef __ANDROID__
+#ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return Android::Exists(path);
    } else {
@@ -496,7 +545,7 @@ bool Exists(const fs::path& path) {

 bool IsFile(const fs::path& path) {
    std::error_code ec;
-#ifdef __ANDROID__
+#ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return !Android::IsDirectory(path);
    } else {
@@ -509,7 +558,7 @@ bool IsFile(const fs::path& path) {

 bool IsDir(const fs::path& path) {
    std::error_code ec;
-#ifdef __ANDROID__
+#ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return Android::IsDirectory(path);
    } else {
@@ -562,7 +611,7 @@ fs::file_type GetEntryType(const fs::path& path) {
 }

 u64 GetSize(const fs::path& path) {
-#ifdef __ANDROID__
+#ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return Android::GetSize(path);
    }
@@ -11,7 +11,7 @@

 #include "common/assert.h"
 #include "common/fs/fs.h"
-#ifdef __ANDROID__
+#ifdef ANDROID
 #include "common/fs/fs_android.h"
 #endif
 #include "common/fs/fs_paths.h"
@@ -90,7 +90,7 @@ public:

    void CreateEdenPaths() {
        std::for_each(eden_paths.begin(), eden_paths.end(), [](auto &path) {
-            void(FS::CreateDirs(path.second));
+            void(FS::CreateDir(path.second));
        });
    }

@@ -126,7 +126,7 @@ public:
        LEGACY_PATH(Yuzu, YUZU)
        LEGACY_PATH(Suyu, SUYU)
 #undef LEGACY_PATH
-#elif __ANDROID__
+#elif ANDROID
        ASSERT(!eden_path.empty());
        eden_path_cache = eden_path / CACHE_DIR;
        eden_path_config = eden_path / CONFIG_DIR;
@@ -149,9 +149,10 @@ public:
        LEGACY_PATH(Suyu, SUYU)
 #undef LEGACY_PATH
 #endif
-        // data
        GenerateEdenPath(EdenPath::EdenDir, eden_path);
        GenerateEdenPath(EdenPath::AmiiboDir, eden_path / AMIIBO_DIR);
+        GenerateEdenPath(EdenPath::CacheDir, eden_path_cache);
+        GenerateEdenPath(EdenPath::ConfigDir, eden_path_config);
        GenerateEdenPath(EdenPath::CrashDumpsDir, eden_path / CRASH_DUMPS_DIR);
        GenerateEdenPath(EdenPath::DumpDir, eden_path / DUMP_DIR);
        GenerateEdenPath(EdenPath::KeysDir, eden_path / KEYS_DIR);
@@ -162,13 +163,10 @@ public:
        GenerateEdenPath(EdenPath::SaveDir, eden_path / NAND_DIR);
        GenerateEdenPath(EdenPath::ScreenshotsDir, eden_path / SCREENSHOTS_DIR);
        GenerateEdenPath(EdenPath::SDMCDir, eden_path / SDMC_DIR);
+        GenerateEdenPath(EdenPath::ShaderDir, eden_path / SHADER_DIR);
        GenerateEdenPath(EdenPath::TASDir, eden_path / TAS_DIR);
        GenerateEdenPath(EdenPath::IconsDir, eden_path / ICONS_DIR);
-        // config
-        GenerateEdenPath(EdenPath::ConfigDir, eden_path_config);
-        // cache
-        GenerateEdenPath(EdenPath::CacheDir, eden_path_cache);
-        GenerateEdenPath(EdenPath::ShaderDir, eden_path_cache / SHADER_DIR);
+
 #ifdef _WIN32
        GenerateLegacyPath(EmuPath::RyujinxDir, GetAppDataRoamingDirectory() / RYUJINX_DIR);
 #else
@@ -449,11 +447,11 @@ std::vector<std::string> SplitPathComponentsCopy(std::string_view filename) {

 std::string SanitizePath(std::string_view path_, DirectorySeparator directory_separator) {
    std::string path(path_);
-#ifdef __ANDROID__
+#ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return path;
    }
-#endif // __ANDROID__
+#endif // ANDROID

    char type1 = directory_separator == DirectorySeparator::BackwardSlash ? '/' : '\\';
    char type2 = directory_separator == DirectorySeparator::BackwardSlash ? '\\' : '/';
@@ -484,7 +482,7 @@ std::string GetParentPath(std::string_view path) {
        return std::string(path);
    }

-#ifdef __ANDROID__
+#ifdef ANDROID
    if (path[0] != '/') {
        std::string path_string{path};
        return FS::Android::GetParentDirectory(path_string);
@@ -22,7 +22,6 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #include "common/scope_exit.h"
-#include "common/literals.h"

 #if defined(__linux__)
 #include <sys/random.h>
@@ -33,8 +32,6 @@
 #include <mach/mach.h>
 #elif defined(__FreeBSD__)
 #include <sys/shm.h>
-#elif defined(__OPENORBIS__)
-#include <orbis/libkernel.h>
 #endif

 // FreeBSD
@@ -125,55 +122,54 @@ static void GetFuncAddress(Common::DynamicLibrary& dll, const char* name, T& pfn
 class HostMemory::Impl {
 public:
    explicit Impl(size_t backing_size_, size_t virtual_size_)
-        : backing_size{backing_size_}
-        , virtual_size{virtual_size_}
-        , process{GetCurrentProcess()}
-        , kernelbase_dll("Kernelbase")
-    {}
-
-    bool Init() {
+        : backing_size{backing_size_}, virtual_size{virtual_size_}, process{GetCurrentProcess()},
+          kernelbase_dll("Kernelbase") {
        if (!kernelbase_dll.IsOpen()) {
            LOG_CRITICAL(HW_Memory, "Failed to load Kernelbase.dll");
-            return false;
+            throw std::bad_alloc{};
        }
        GetFuncAddress(kernelbase_dll, "CreateFileMapping2", pfn_CreateFileMapping2);
        GetFuncAddress(kernelbase_dll, "VirtualAlloc2", pfn_VirtualAlloc2);
        GetFuncAddress(kernelbase_dll, "MapViewOfFile3", pfn_MapViewOfFile3);
        GetFuncAddress(kernelbase_dll, "UnmapViewOfFile2", pfn_UnmapViewOfFile2);

-        if (!pfn_CreateFileMapping2 || !pfn_VirtualAlloc2 || !pfn_MapViewOfFile3 || !pfn_UnmapViewOfFile2) {
-            LOG_CRITICAL(HW_Memory, "Failed to find functions for virtual allocs");
-            return false;
-        }
-
        // Allocate backing file map
-        backing_handle = pfn_CreateFileMapping2(INVALID_HANDLE_VALUE, nullptr, FILE_MAP_WRITE | FILE_MAP_READ, PAGE_READWRITE, SEC_COMMIT, backing_size, nullptr, nullptr, 0);
+        backing_handle =
+            pfn_CreateFileMapping2(INVALID_HANDLE_VALUE, nullptr, FILE_MAP_WRITE | FILE_MAP_READ,
+                                   PAGE_READWRITE, SEC_COMMIT, backing_size, nullptr, nullptr, 0);
        if (!backing_handle) {
-            LOG_CRITICAL(HW_Memory, "Failed to allocate {} MiB of backing memory", backing_size >> 20);
-            return false;
+            LOG_CRITICAL(HW_Memory, "Failed to allocate {} MiB of backing memory",
+                         backing_size >> 20);
+            throw std::bad_alloc{};
        }
        // Allocate a virtual memory for the backing file map as placeholder
-        backing_base = static_cast<u8*>(pfn_VirtualAlloc2(process, nullptr, backing_size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, nullptr, 0));
+        backing_base = static_cast<u8*>(pfn_VirtualAlloc2(process, nullptr, backing_size,
+                                                          MEM_RESERVE | MEM_RESERVE_PLACEHOLDER,
+                                                          PAGE_NOACCESS, nullptr, 0));
        if (!backing_base) {
            Release();
-            LOG_CRITICAL(HW_Memory, "Failed to reserve {} MiB of virtual memory", backing_size >> 20);
-            return false;
+            LOG_CRITICAL(HW_Memory, "Failed to reserve {} MiB of virtual memory",
+                         backing_size >> 20);
+            throw std::bad_alloc{};
        }
        // Map backing placeholder
-        void* const ret = pfn_MapViewOfFile3(backing_handle, process, backing_base, 0, backing_size, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, nullptr, 0);
+        void* const ret = pfn_MapViewOfFile3(backing_handle, process, backing_base, 0, backing_size,
+                                             MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, nullptr, 0);
        if (ret != backing_base) {
            Release();
            LOG_CRITICAL(HW_Memory, "Failed to map {} MiB of virtual memory", backing_size >> 20);
-            return false;
+            throw std::bad_alloc{};
        }
        // Allocate virtual address placeholder
-        virtual_base = static_cast<u8*>(pfn_VirtualAlloc2(process, nullptr, virtual_size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, nullptr, 0));
+        virtual_base = static_cast<u8*>(pfn_VirtualAlloc2(process, nullptr, virtual_size,
+                                                          MEM_RESERVE | MEM_RESERVE_PLACEHOLDER,
+                                                          PAGE_NOACCESS, nullptr, 0));
        if (!virtual_base) {
            Release();
-            LOG_CRITICAL(HW_Memory, "Failed to reserve {} GiB of virtual memory", virtual_size >> 30);
-            return false;
+            LOG_CRITICAL(HW_Memory, "Failed to reserve {} GiB of virtual memory",
+                         virtual_size >> 30);
+            throw std::bad_alloc{};
        }
-        return true;
    }

    ~Impl() {
@@ -395,9 +391,6 @@ private:
    ankerl::unordered_dense::map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset
 };

-#elif defined(__OPENORBIS__) || defined(__managarm__)
-// None of the luxuries of POSIX, all of the suffering
-// For managarm: see https://github.com/managarm/managarm/issues/1370
 #else // ^^^ Windows ^^^ vvv POSIX vvv

 #ifdef ARCHITECTURE_arm64
@@ -503,44 +496,18 @@ static int shm_open_anon(int flags, mode_t mode) {
 class HostMemory::Impl {
 public:
    explicit Impl(size_t backing_size_, size_t virtual_size_)
-        : backing_size{backing_size_}
-        , virtual_size{virtual_size_}
-    {}
-
-    bool Init() {
+        : backing_size{backing_size_}, virtual_size{virtual_size_} {
        long page_size = sysconf(_SC_PAGESIZE);
-        ASSERT_MSG(page_size == 0x1000, "page size {:#x} is incompatible with 4K paging", page_size);
+        ASSERT_MSG(page_size == 0x1000, "page size {:#x} is incompatible with 4K paging",
+                   page_size);
        // Backing memory initialization
 #if defined(__sun__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
        fd = shm_open_anon(O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
 #elif defined(__OpenBSD__)
        fd = shm_open_anon(O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
 #elif defined(__FreeBSD__)
-        int n_page_sizes = getpagesizes(nullptr, 0);
-        if (n_page_sizes > 0) {
-            std::vector<size_t> page_sizes(n_page_sizes);
-            if (getpagesizes(page_sizes.data(), n_page_sizes) > 0) {
-                size_t max_size = page_sizes[0];
-                size_t max_index = 0;
-                for (size_t i = 0; i < page_sizes.size(); ++i) {
-                    using namespace Common::Literals;
-                    if (page_sizes[i] <= 4_GiB) {
-                        max_size = (std::max)(max_size, page_sizes[i]);
-                        max_index = i;
-                    }
-                }
-                LOG_WARNING(Common_Memory, "using largepage of size {} #{}", max_size, max_index);
-                // Do not use SHM_LARGEPAGE_ALLOC_HARD, yknow what will happen when you do?
-                // the entire Eden process will hang for eternity! that's what will happen
-                // Want to fuck around and find out? Go ahead, I tempt you change the "default" to "hard"
-                fd = shm_create_largepage(SHM_ANON, O_RDWR, max_index, SHM_LARGEPAGE_ALLOC_DEFAULT, 0600);
-            }
-        }
-        if (fd < 0) {
-            LOG_WARNING(Common_Memory, "unable to force largepage: {}", strerror(errno));
-            fd = shm_open(SHM_ANON, O_RDWR, 0600);
-        }
-#elif defined(__APPLE__) || defined(__managarm__)
+        fd = shm_open(SHM_ANON, O_RDWR, 0600);
+#elif defined(__APPLE__)
        // macOS doesn't have memfd_create, use anonymous temporary file
        char template_path[] = "/tmp/eden_mem_XXXXXX";
        fd = mkstemp(template_path);
@@ -571,29 +538,17 @@ public:
                close(fd);
            }
        } else {
-#ifdef __FreeBSD__
-            // Prevent dirty tracking of memfd
-            backing_base = static_cast<u8*>(mmap(nullptr, backing_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NOSYNC, fd, 0));
-#else
            backing_base = static_cast<u8*>(mmap(nullptr, backing_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));
-#endif
-        }
-        if (backing_base == MAP_FAILED) {
-            LOG_CRITICAL(HW_Memory, "mmap failed: {}", strerror(errno));
-            return false;
        }
+        ASSERT_MSG(backing_base != MAP_FAILED, "mmap failed: {}", strerror(errno));

        // Virtual memory initialization
        virtual_base = virtual_map_base = static_cast<u8*>(ChooseVirtualBase(virtual_size));
-        if (virtual_base == MAP_FAILED) {
-            LOG_CRITICAL(HW_Memory, "mmap failed: {}", strerror(errno));
-            return false;
-        }
+        ASSERT_MSG(virtual_base != MAP_FAILED, "mmap failed: {}", strerror(errno));
 #if defined(__linux__)
        madvise(virtual_base, virtual_size, MADV_HUGEPAGE);
 #endif
        free_manager.SetAddressSpace(virtual_base, virtual_size);
-        return true;
    }

    ~Impl() {
@@ -714,35 +669,17 @@ private:

 #endif // ^^^ POSIX ^^^

-HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_)
-    : backing_size(backing_size_)
-    , virtual_size(virtual_size_)
-{
-#if defined(__OPENORBIS__) || defined(__managarm__)
-    LOG_WARNING(HW_Memory, "Platform doesn't support fastmem");
-    fallback_buffer.emplace(backing_size);
-    backing_base = fallback_buffer->data();
-    virtual_base = nullptr;
-#else
+HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_) : backing_size(backing_size_), virtual_size(virtual_size_) {
    // Try to allocate a fastmem arena.
    // The implementation will fail with std::bad_alloc on errors.
    impl = std::make_unique<HostMemory::Impl>(AlignUp(backing_size, PageAlignment), AlignUp(virtual_size, PageAlignment) + HugePageSize);
-    if (impl->Init()) {
-        backing_base = impl->backing_base;
-        virtual_base = impl->virtual_base;
-        if (virtual_base) {
-            // Ensure the virtual base is aligned to the L2 block size.
-            virtual_base = reinterpret_cast<u8*>(Common::AlignUp(uintptr_t(virtual_base), HugePageSize));
-            virtual_base_offset = virtual_base - impl->virtual_base;
-        }
-    } else {
-        impl.reset();
-        LOG_WARNING(HW_Memory, "Platform can support fastmem, but can't create it");
-        fallback_buffer.emplace(backing_size);
-        backing_base = fallback_buffer->data();
-        virtual_base = nullptr;
+    backing_base = impl->backing_base;
+    virtual_base = impl->virtual_base;
+    if (virtual_base) {
+        // Ensure the virtual base is aligned to the L2 block size.
+        virtual_base = reinterpret_cast<u8*>(Common::AlignUp(uintptr_t(virtual_base), HugePageSize));
+        virtual_base_offset = virtual_base - impl->virtual_base;
    }
-#endif
 }

 HostMemory::~HostMemory() = default;
@@ -751,8 +688,8 @@ HostMemory::HostMemory(HostMemory&&) noexcept = default;

 HostMemory& HostMemory::operator=(HostMemory&&) noexcept = default;

-void HostMemory::Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perms, bool separate_heap) {
-#if !(defined(__OPENORBIS__) || defined(__managarm__))
+void HostMemory::Map(size_t virtual_offset, size_t host_offset, size_t length,
+                     MemoryPermission perms, bool separate_heap) {
    ASSERT(virtual_offset % PageAlignment == 0);
    ASSERT(host_offset % PageAlignment == 0);
    ASSERT(length % PageAlignment == 0);
@@ -762,11 +699,9 @@ void HostMemory::Map(size_t virtual_offset, size_t host_offset, size_t length, M
        return;
    }
    impl->Map(virtual_offset + virtual_base_offset, host_offset, length, perms);
-#endif
 }

 void HostMemory::Unmap(size_t virtual_offset, size_t length, bool separate_heap) {
-#if !(defined(__OPENORBIS__) || defined(__managarm__))
    ASSERT(virtual_offset % PageAlignment == 0);
    ASSERT(length % PageAlignment == 0);
    ASSERT(virtual_offset + length <= virtual_size);
@@ -774,11 +709,9 @@ void HostMemory::Unmap(size_t virtual_offset, size_t length, bool separate_heap)
        return;
    }
    impl->Unmap(virtual_offset + virtual_base_offset, length);
-#endif
 }

 void HostMemory::Protect(size_t virtual_offset, size_t length, MemoryPermission perm) {
-#if !(defined(__OPENORBIS__) || defined(__managarm__))
    ASSERT(virtual_offset % PageAlignment == 0);
    ASSERT(length % PageAlignment == 0);
    ASSERT(virtual_offset + length <= virtual_size);
@@ -789,7 +722,6 @@ void HostMemory::Protect(size_t virtual_offset, size_t length, MemoryPermission
    const bool write = True(perm & MemoryPermission::Write);
    const bool execute = True(perm & MemoryPermission::Execute);
    impl->Protect(virtual_offset + virtual_base_offset, length, read, write, execute);
-#endif
 }

 void HostMemory::ClearBackingRegion(size_t physical_offset, size_t length, u32 fill_value) {
@@ -797,12 +729,10 @@ void HostMemory::ClearBackingRegion(size_t physical_offset, size_t length, u32 f
 }

 void HostMemory::EnableDirectMappedAddress() {
-#if !(defined(__OPENORBIS__) || defined(__managarm__))
    if (impl) {
        impl->EnableDirectMappedAddress();
        virtual_size += reinterpret_cast<uintptr_t>(virtual_base);
    }
-#endif
 }

 } // namespace Common
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
@@ -7,7 +7,6 @@
 #pragma once

 #include <memory>
-#include <optional>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/virtual_buffer.h"
@@ -77,16 +76,12 @@ private:
    size_t backing_size{};
    size_t virtual_size{};

-#if !(defined(__OPENORBIS__) || defined(__managarm__))
    // Low level handler for the platform dependent memory routines
    class Impl;
    std::unique_ptr<Impl> impl;
-#endif
    u8* backing_base{};
    u8* virtual_base{};
    size_t virtual_base_offset{};
-    // Windows requires it for kernels whom lack proper support for some functions!
-    std::optional<Common::VirtualBuffer<u8>> fallback_buffer;
 };

 } // namespace Common
@@ -320,7 +320,7 @@ struct DebuggerBackend final : public Backend {
    void Flush() noexcept override {}
 };
 #endif
-#ifdef __ANDROID__
+#ifdef ANDROID
 /// @brief Backend that writes to the Android logcat
 struct LogcatBackend : public Backend {
    explicit LogcatBackend() noexcept = default;
@@ -359,7 +359,7 @@ struct Impl {
 #ifdef _WIN32
        lambda(static_cast<Backend&>(debugger_backend));
 #endif
-#ifdef __ANDROID__
+#ifdef ANDROID
        lambda(static_cast<Backend&>(lc_backend));
 #endif
    }
@@ -372,7 +372,7 @@ struct Impl {
 #ifdef _WIN32
    DebuggerBackend debugger_backend{};
 #endif
-#ifdef __ANDROID__
+#ifdef ANDROID
    LogcatBackend lc_backend{};
 #endif
    std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
@@ -62,21 +62,16 @@ std::vector<Asset> Release::GetPlatformAssets() const {

 #ifdef _WIN32
 #ifdef ARCHITECTURE_x86_64
-#ifdef _MSC_VER
-    find_asset("Standard", {"amd64-msvc-standard.exe", "amd64-msvc-standard.zip"});
-#else // _MSC_VER
-    find_asset("Standard", {BUILD_ID "-gcc-standard.exe", BUILD_ID "-gcc-standard.zip"});
-    find_asset("PGO", {BUILD_ID "-clang-pgo.exe", BUILD_ID "-clang-pgo.zip"});
-#endif // _MSC_VER
+    find_asset("Standard", {"amd64-msvc-standard.exe", "amd64-msvc-standard.zip", "mingw-amd64-gcc-standard.exe", "mingw-amd64-gcc-standard.zip"});
+    find_asset("PGO", {"mingw-amd64-clang-pgo.exe", "mingw-amd64-clang-pgo.zip"});
 #elif defined(ARCHITECTURE_arm64)
-    find_asset("Standard", {"arm64-clang-standard.exe", "arm64-clang-standard.zip"});
-    find_asset("PGO", {"arm64-clang-pgo.exe", "arm64-clang-pgo.zip"});
-#endif // ARCHITECTURE_arm64
+    find_asset("Standard", {"mingw-arm64-clang-standard.exe", "mingw-arm64-clang-standard.zip"});
+    find_asset("PGO", {"mingw-arm64-clang-pgo.exe", "mingw-arm64-clang-pgo.zip"});
+#endif
 #elif defined(__APPLE__)
 #ifdef ARCHITECTURE_arm64
-    find_asset("Standard", {"standard.dmg", "standard.tar.gz", ".dmg", ".tar.gz"});
-    find_asset("PGO", {"pgo.dmg", "pgo.tar.gz"});
-#endif // ARCHITECTURE_arm64
+    find_asset("Standard", {".dmg", ".tar.gz"});
+#endif
 #elif defined(__ANDROID__)
 #ifdef ARCHITECTURE_x86_64
    find_asset("Standard", {"chromeos.apk"});
@@ -87,9 +82,9 @@ std::vector<Asset> Release::GetPlatformAssets() const {
    find_asset("Standard", {"optimized.apk"});
 #else
    find_asset("Standard", {"standard.apk"});
-#endif // GENSHIN_SPOOF
-#endif // ARCHITECTURE_arm64
-#endif // __APPLE__
+#endif
+#endif
+#endif
    return found_assets;
 }

@@ -336,7 +336,7 @@ struct Values {
        RendererBackend::Vulkan,
 #endif
        "backend", Category::Renderer};
-    SwitchableSetting<u32> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer, Specialization::RuntimeList};
+    SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer, Specialization::RuntimeList};

    // Graphics Settings
    ResolutionScalingInfo resolution_info{};
@@ -359,7 +359,7 @@ struct Values {
                                                    true,
                                                    true};
    SwitchableSetting<int, true> fsr_sharpening_slider{linkage,
-#ifdef __ANDROID__
+#ifdef ANDROID
                                                       0,
 #else
                                                       25,
@@ -417,7 +417,7 @@ struct Values {
                                         linkage, 0, "bg_blue", Category::Renderer, Specialization::Default, true, true};

    SwitchableSetting<GpuAccuracy, true> gpu_accuracy{linkage,
-#ifdef __ANDROID__
+#ifdef ANDROID
                                                      GpuAccuracy::Low,
 #else
                                                      GpuAccuracy::Medium,
@@ -447,7 +447,7 @@ struct Values {
                                                      "nvdec_emulation", Category::RendererAdvanced};

    SwitchableSetting<AnisotropyMode, true> max_anisotropy{linkage,
-#ifdef __ANDROID__
+#ifdef ANDROID
                                                           AnisotropyMode::Default,
 #else
                                                           AnisotropyMode::Automatic,
@@ -500,7 +500,7 @@ struct Values {
                                                Category::RendererAdvanced};

    SwitchableSetting<bool> use_reactive_flushing{linkage,
-#ifdef __ANDROID__
+#ifdef ANDROID
                                                  false,
 #else
                                                  true,
@@ -519,7 +519,7 @@ struct Values {
                                                  true,
                                                  true};

-#ifdef __ANDROID__
+#ifdef ANDROID
    SwitchableSetting<bool> use_optimized_vertex_buffers{linkage,
                                                 false,
                                                 "use_optimized_vertex_buffers",
@@ -553,7 +553,7 @@ struct Values {
                                        true,
                                        true};
    SwitchableSetting<bool> async_presentation{linkage,
-#ifdef __ANDROID__
+#ifdef ANDROID
                                               false,
 #else
                                               false,
@@ -599,7 +599,7 @@ struct Values {
                                                  Category::RendererHacks};

    SwitchableSetting<ExtendedDynamicState> dyna_state{linkage,
-#if defined(__ANDROID__)
+#if defined(ANDROID)
                                           ExtendedDynamicState::Disabled,
 #elif defined(__APPLE__)
                                           ExtendedDynamicState::Disabled,
@@ -618,7 +618,7 @@ struct Values {
                                                Specialization::Scalar};

    SwitchableSetting<bool> vertex_input_dynamic_state{linkage,
-#ifdef __ANDROID__
+#if defined (ANDROID)
                                                       false,
 #else
                                                       true,
@@ -634,7 +634,7 @@ struct Values {
                                                    linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
    Setting<bool> enable_renderdoc_hotkey{linkage, false, "renderdoc_hotkey",
                                          Category::RendererDebug};
-#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
+#if defined(ANDROID) && defined(ARCHITECTURE_arm64)
    // Debug override for automatic BCn patching detection
    Setting<bool> patch_old_qcom_drivers{linkage, false, "patch_old_qcom_drivers",
                                         Category::RendererDebug};
@@ -661,8 +661,8 @@ struct Values {
                                      false,   true, &custom_rtc_enabled};
    SwitchableSetting<s64, true> custom_rtc_offset{linkage,
                                                   0,
-                                                   (std::numeric_limits<s64>::min)(),
-                                                   (std::numeric_limits<s64>::max)(),
+                                                   (std::numeric_limits<int>::min)(),
+                                                   (std::numeric_limits<int>::max)(),
                                                   "custom_rtc_offset",
                                                   Category::System,
                                                   Specialization::Countable,
@@ -679,7 +679,7 @@ struct Values {
    Setting<s32> current_user{linkage, 0, "current_user", Category::System};

    SwitchableSetting<ConsoleMode> use_docked_mode{linkage,
-#ifdef __ANDROID__
+#ifdef ANDROID
                                                   ConsoleMode::Handheld,
 #else
                                                   ConsoleMode::Docked,
@@ -751,7 +751,7 @@ struct Values {

    Setting<std::string> touch_device{linkage, "min_x:100,min_y:50,max_x:1800,max_y:850",
                                      "touch_device", Category::Controls};
-    Setting<u32> touch_from_button_map_index{linkage, 0, "touch_from_button_map",
+    Setting<int> touch_from_button_map_index{linkage, 0, "touch_from_button_map",
                                             Category::Controls};
    std::vector<TouchFromButtonMap> touch_from_button_maps;

@@ -779,13 +779,7 @@ struct Values {
    bool record_frame_times;
    Setting<bool> use_gdbstub{linkage, false, "use_gdbstub", Category::Debugging};
    Setting<u16> gdbstub_port{linkage, 6543, "gdbstub_port", Category::Debugging};
-    SwitchableSetting<std::string> program_args{linkage,
-                                                std::string(),
-                                                "program_args",
-                                                Category::System,
-                                                Specialization::Default,
-                                                true,    // save_ — persist in config file
-                                                false};  // runtime_modifiable_ — startup-only
+    Setting<std::string> program_args{linkage, std::string(), "program_args", Category::Debugging};
    Setting<bool> dump_exefs{linkage, false, "dump_exefs", Category::Debugging};
    Setting<bool> dump_nso{linkage, false, "dump_nso", Category::Debugging};
    Setting<bool> dump_shaders{
@@ -145,8 +145,8 @@ ENUM(ConfirmStop, Ask_Always, Ask_Based_On_Game, Ask_Never);
 ENUM(FullscreenMode, Borderless, Exclusive);
 ENUM(NvdecEmulation, Off, Cpu, Gpu);
 ENUM(ResolutionSetup, Res1_4X, Res1_2X, Res3_4X, Res1X, Res5_4X, Res3_2X, Res2X, Res3X, Res4X, Res5X, Res6X, Res7X, Res8X);
-ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczos, ScaleForce, Fsr, Area, ZeroTangent, BSpline, Mitchell, Spline1, Mmpx, Sgsr, SgsrEdge);
-ENUM(AntiAliasing, None, Fxaa, Smaa);
+ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczos, ScaleForce, Fsr, Area, ZeroTangent, BSpline, Mitchell, Spline1, Mmpx, Sgsr, SgsrEdge, MaxEnum);
+ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);
 ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
 ENUM(ConsoleMode, Handheld, Docked);
 ENUM(AppletMode, HLE, LLE);
@@ -11,7 +11,6 @@
 #include <optional>
 #include <stdexcept>
 #include <string>
-#include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <fmt/core.h>
@@ -102,15 +101,7 @@ public:
     * @param val The desired value
     */
    virtual void SetValue(const Type& val) {
-        // Enums have a maximal range which they're allowed
-        Type temp{};
-        if constexpr (std::is_enum_v<Type>) {
-            auto const r_min = std::underlying_type_t<Type>(0);
-            auto const r_max = std::underlying_type_t<Type>(EnumMetadata<Type>::GetLast());
-            temp = Type(std::clamp(std::underlying_type_t<Type>(val), r_min, r_max));
-        } else {
-            temp = ranged ? std::clamp(val, this->minimum, this->maximum) : val;
-        }
+        Type temp{ranged ? std::clamp(val, minimum, maximum) : val};
        std::swap(value, temp);
    }

@@ -138,7 +129,7 @@ protected:
        } else if constexpr (std::is_floating_point_v<Type>) {
            return fmt::format("{:f}", value_);
        } else if constexpr (std::is_enum_v<Type>) {
-            return std::to_string(std::underlying_type_t<Type>(value_));
+            return std::to_string(u32(value_));
        } else {
            return std::to_string(value_);
        }
@@ -380,15 +371,7 @@ public:
     * @param val The new value
     */
    void SetValue(const Type& val) override final {
-        // Enums have a maximal range which they're allowed
-        Type temp{};
-        if constexpr (std::is_enum_v<Type>) {
-            auto const r_min = std::underlying_type_t<Type>(0);
-            auto const r_max = std::underlying_type_t<Type>(EnumMetadata<Type>::GetLast());
-            temp = Type(std::clamp(std::underlying_type_t<Type>(val), r_min, r_max));
-        } else {
-            temp = ranged ? std::clamp(val, this->minimum, this->maximum) : val;
-        }
+        Type temp{ranged ? std::clamp(val, this->minimum, this->maximum) : val};
        if (use_global) {
            std::swap(this->value, temp);
        } else {
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -20,14 +20,10 @@
 namespace Common {

 struct SlotId {
-    static constexpr u32 TAGGED_MASK = 0x7fffffff;
-    static constexpr u32 TAGGED_VALUE = 0x80000000;
    static constexpr u32 INVALID_INDEX = (std::numeric_limits<u32>::max)();

-    constexpr u32 Value() const noexcept {
-        return index & (~TAGGED_VALUE);
-    }
    constexpr auto operator<=>(const SlotId&) const noexcept = default;
+
    constexpr explicit operator bool() const noexcept {
        return index != INVALID_INDEX;
    }
@@ -51,12 +47,12 @@ public:
        Iterator& operator++() noexcept {
            const u64* const bitset = slot_vector->stored_bitset.data();
            const u32 size = static_cast<u32>(slot_vector->stored_bitset.size()) * 64;
-            if (id.Value() < size) {
+            if (id.index < size) {
                do {
                    ++id.index;
-                } while (id.Value() < size && !IsValid(bitset));
-                if (id.Value() == size) {
-                    id = SlotId{};
+                } while (id.index < size && !IsValid(bitset));
+                if (id.index == size) {
+                    id.index = SlotId::INVALID_INDEX;
                }
            }
            return *this;
@@ -89,7 +85,7 @@ public:
            : slot_vector{slot_vector_}, id{id_} {}

        bool IsValid(const u64* bitset) const noexcept {
-            return ((bitset[id.Value() / 64] >> (id.Value() % 64)) & 1) != 0;
+            return ((bitset[id.index / 64] >> (id.index % 64)) & 1) != 0;
        }

        SlotVector<T>* slot_vector;
@@ -111,12 +107,12 @@ public:

    [[nodiscard]] T& operator[](SlotId id) noexcept {
        ValidateIndex(id);
-        return values[id.Value()].object;
+        return values[id.index].object;
    }

    [[nodiscard]] const T& operator[](SlotId id) const noexcept {
        ValidateIndex(id);
-        return values[id.Value()].object;
+        return values[id.index].object;
    }

    template <typename... Args>
@@ -129,9 +125,9 @@ public:
    }

    void erase(SlotId id) noexcept {
-        values[id.Value()].object.~T();
-        free_list.push_back(id.Value());
-        ResetStorageBit(id.Value());
+        values[id.index].object.~T();
+        free_list.push_back(id.index);
+        ResetStorageBit(id.index);
    }

    [[nodiscard]] Iterator begin() noexcept {
@@ -145,7 +141,7 @@ public:
    }

    [[nodiscard]] Iterator end() noexcept {
-        return Iterator(this, SlotId{});
+        return Iterator(this, SlotId{SlotId::INVALID_INDEX});
    }

    [[nodiscard]] size_t size() const noexcept {
@@ -179,8 +175,8 @@ private:

    void ValidateIndex(SlotId id) const noexcept {
        DEBUG_ASSERT(id);
-        DEBUG_ASSERT(id.Value() / 64 < stored_bitset.size());
-        DEBUG_ASSERT(((stored_bitset[id.Value() / 64] >> (id.Value() % 64)) & 1) != 0);
+        DEBUG_ASSERT(id.index / 64 < stored_bitset.size());
+        DEBUG_ASSERT(((stored_bitset[id.index / 64] >> (id.index % 64)) & 1) != 0);
    }

    [[nodiscard]] u32 FreeValueIndex() noexcept {
@@ -212,7 +208,9 @@ private:

        const size_t old_free_size = free_list.size();
        free_list.resize(old_free_size + (new_capacity - values_capacity));
-        std::iota(free_list.begin() + old_free_size, free_list.end(), u32(values_capacity));
+        std::iota(free_list.begin() + old_free_size, free_list.end(),
+                  static_cast<u32>(values_capacity));
+
        delete[] values;
        values = new_values;
        values_capacity = new_capacity;
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
@@ -18,7 +18,7 @@
 #include <windows.h>
 #endif

-#ifdef __ANDROID__
+#ifdef ANDROID
 #include <common/fs/fs_android.h>
 #endif

@@ -45,7 +45,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
    if (full_path.empty())
        return false;

-#ifdef __ANDROID__
+#ifdef ANDROID
    if (full_path[0] != '/') {
        *_pPath = Common::FS::Android::GetParentDirectory(full_path);
        *_pFilename = Common::FS::Android::GetFilename(full_path);
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2012 PPSSPP Project
@@ -10,10 +10,12 @@

 #pragma once

+#if defined(_MSC_VER)
 #include <cstdlib>
+#endif
+#include <bit>
 #include <cstring>
 #include <type_traits>
-#include <bit>
 #include "common/common_types.h"

 namespace Common {
@@ -4,8 +4,6 @@
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <chrono>
-#include <limits>
 #include <string>
 #include <thread>

@@ -20,35 +18,24 @@
 #elif defined(_WIN32)
 #include <windows.h>
 #include "common/string_util.h"
-#include "common/windows/timer_resolution.h"
 #else
 #if defined(__FreeBSD__)
 #include <sys/cpuset.h>
 #include <sys/_cpuset.h>
 #include <pthread_np.h>
-// Compatibility with CPUset
-#define cpu_set_t cpuset_t
 #elif defined(__DragonFly__) || defined(__OpenBSD__) || defined(__Bitrig__)
 #include <pthread_np.h>
 #endif
 #include <pthread.h>
 #include <sched.h>
 #endif
-
 #ifndef _WIN32
 #include <unistd.h>
 #endif

-#include "common/cpu_features.h"
-#ifdef ARCHITECTURE_x86_64
-#ifdef _MSC_VER
-#include <intrin.h>
-#else
-#include <x86intrin.h>
+#ifdef __FreeBSD__
+#   define cpu_set_t cpuset_t
 #endif
-#include "common/x64/rdtsc.h"
-#endif
-#include "core/core_timing.h"

 namespace Common {

@@ -157,102 +144,4 @@ void PinCurrentThreadToPerformanceCore(size_t core_id) {
    }
 }

-#ifdef ARCHITECTURE_x86_64
-// On Linux and UNIX systems, a futex would nominally be used to cover the costs
-// the idea is that it's intuitivelly cheaper to use a direct instruction as opposed to a full futex call
-// the underlying libc++ implementation uses pthread_cond_timedwait which MAY invoke a futex
-// Let's pretend the OS is too expensive to jump into, and avoid ANY context switches
-// this should *IN THEORY* lower CPU usage while just waiting for stuff effectively
-// For windows the minimal quanta resolution is about 500us, and normal CRT cond var is 1.5ms(?)
-// so may as well avoid that too
-// Let's just give ALL platforms the same mechanisms (almost) for when they have umonitor OR waitpkg
-#ifdef __clang__
-__attribute__((target("waitpkg,mwaitx")))
-#elif defined(__GNUC__)
-#pragma GCC target("waitpkg")
-#pragma GCC target("mwaitx")
-#endif
-bool Event::WaitFor(const std::chrono::nanoseconds time) {
-#ifdef _WIN32
-    auto const start = Common::X64::FencedRDTSC();
-    auto const& caps = Common::g_cpu_caps;
-    [[maybe_unused]] auto const end = start + Common::g_wall_clock.NsToTicks(time);
-    if (caps.monitorx) {
-        while (true) {
-            // Armed monitor, as per manual, MWAITX must be conditional if the condition isn't satisfied
-            // to prevent a race condition.
-            _mm_monitorx(reinterpret_cast<u64*>(std::addressof(is_set)), 0, 0);
-            if (!is_set.load()) {
-                // RDTSC may be fenced here due to atomic load
-#ifdef _MSC_VER
-                auto const now = __rdtsc();
-#else
-                auto const now = _rdtsc();
-#endif
-                if (end > now) {
-                    u32 const cycles = std::min<u32>((std::numeric_limits<u32>::max)(), s64(end) - s64(now));
-                    // See here: https://github.com/torvalds/linux/blob/948a64995aca6820abefd17f1a4258f5835c5ad9/arch/x86/lib/delay.c#L93
-                    // MWAITX accepts a 32-bit input timer which determines the total number of cycles to wait for
-                    // NOT THE TOTAL ABSOLUTE TSC VALUE, it's just a delta
-                    // BIT[1] = use a timer
-                    // Hint = 0: Use C1 state when sleepy (means slower wakeup but better savings)
-                    _mm_mwaitx(1 << 1, 0u, cycles);
-                    if (!is_set.load())
-                        return false;
-                } else
-                    return false; //timeout
-            }
-            bool expected = true;
-            if (is_set.compare_exchange_weak(expected, false, std::memory_order_release))
-                return true;
-        }
-    } else if (caps.waitpkg) {
-        // #UD If CPUID.7.0:ECX.WAITPKG[bit 5]=0.
-        while (true) {
-            _umonitor(std::addressof(is_set));
-            if (!is_set.load() && !_umwait(0, end)) //umwait is absolute time!!!
-                return false;
-            bool expected = true;
-            if (is_set.compare_exchange_weak(expected, false, std::memory_order_release))
-                return true;
-        }
-    } else {
-#ifdef _MSC_VER
-        while (!is_set.load() && end > __rdtsc())
-            Common::Windows::SleepForOneTick();
-#else
-        while (!is_set.load() && end > _rdtsc())
-            Common::Windows::SleepForOneTick();
-#endif
-        if (is_set.load())
-            Reset();
-        return true;
-    }
-#else
-    std::unique_lock lk{mutex};
-    if (!condvar.wait_for(lk, time, [this] { return is_set.load(); }))
-        return false;
-    is_set = false;
-    return true;
-#endif
-}
-#else
-bool Event::WaitFor(const std::chrono::nanoseconds time) {
-#ifdef _WIN32
-    auto const end = Common::g_wall_clock.GetTimeNS() + time;
-    while (!is_set.load() && end > Common::g_wall_clock.GetTimeNS())
-        Common::Windows::SleepForOneTick();
-    if (is_set.load())
-        Reset();
-    return true;
-#else
-    std::unique_lock lk{mutex};
-    if (!condvar.wait_for(lk, time, [this] { return is_set.load(); }))
-        return false;
-    is_set = false;
-    return true;
-#endif
-}
-#endif
-
 } // namespace Common
@@ -34,10 +34,16 @@ public:
        is_set = false;
    }

-    bool WaitFor(const std::chrono::nanoseconds time);
+    bool WaitFor(const std::chrono::nanoseconds& time) {
+        std::unique_lock lk{mutex};
+        if (!condvar.wait_for(lk, time, [this] { return is_set.load(); }))
+            return false;
+        is_set = false;
+        return true;
+    }

-    template<class Clock, class Duration>
-    bool WaitUntil(const std::chrono::time_point<Clock, Duration> time) {
+    template <class Clock, class Duration>
+    bool WaitUntil(const std::chrono::time_point<Clock, Duration>& time) {
        std::unique_lock lk{mutex};
        if (!condvar.wait_until(lk, time, [this] { return is_set.load(); }))
            return false;
@@ -57,9 +63,9 @@ public:
    }

 private:
-    alignas(64) std::atomic<bool> is_set{false};
    std::condition_variable condvar;
    std::mutex mutex;
+    std::atomic_bool is_set{false};
 };

 class Barrier {
@@ -0,0 +1,197 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "common/steady_clock.h"
+#include "common/uint128.h"
+#include "common/wall_clock.h"
+
+#ifdef __ANDROID__
+#include <sys/system_properties.h>
+#endif
+#ifdef ARCHITECTURE_x86_64
+#include "common/x64/cpu_detect.h"
+#include "common/x64/rdtsc.h"
+#endif
+
+namespace Common {
+
+#if defined(ARCHITECTURE_x86_64)
+WallClock::WallClock(bool invariant_, u64 rdtsc_frequency_) noexcept
+    : invariant{invariant_}
+    , rdtsc_frequency{rdtsc_frequency_}
+    , ns_rdtsc_factor{invariant_ ? 0 : GetFixedPoint64Factor(NsRatio::den, rdtsc_frequency_)}
+    , us_rdtsc_factor{invariant_ ? 0 : GetFixedPoint64Factor(UsRatio::den, rdtsc_frequency_)}
+    , ms_rdtsc_factor{invariant_ ? 0 : GetFixedPoint64Factor(MsRatio::den, rdtsc_frequency_)}
+    , cntpct_rdtsc_factor{invariant_ ? 0 : GetFixedPoint64Factor(CNTFRQ, rdtsc_frequency_)}
+    , gputick_rdtsc_factor{invariant_ ? 0 : GetFixedPoint64Factor(GPUTickFreq, rdtsc_frequency_)}
+{}
+
+std::chrono::nanoseconds WallClock::GetTimeNS() const {
+    if (invariant)
+        return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch());
+    return std::chrono::nanoseconds{MultiplyHigh(GetUptime(), ns_rdtsc_factor)};
+}
+
+std::chrono::microseconds WallClock::GetTimeUS() const {
+    if (invariant)
+        return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch());
+    return std::chrono::microseconds{MultiplyHigh(GetUptime(), us_rdtsc_factor)};
+}
+
+std::chrono::milliseconds WallClock::GetTimeMS() const {
+    if (invariant)
+        return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
+    return std::chrono::milliseconds{MultiplyHigh(GetUptime(), ms_rdtsc_factor)};
+}
+
+s64 WallClock::GetCNTPCT() const {
+    if (invariant)
+        return GetUptime() * NsToCNTPCTRatio::num / NsToCNTPCTRatio::den;
+    return MultiplyHigh(GetUptime(), cntpct_rdtsc_factor);
+}
+
+s64 WallClock::GetGPUTick() const {
+    if (invariant)
+        return GetUptime() * NsToGPUTickRatio::num / NsToGPUTickRatio::den;
+    return MultiplyHigh(GetUptime(), gputick_rdtsc_factor);
+}
+
+s64 WallClock::GetUptime() const {
+    if (invariant)
+        return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
+    return s64(Common::X64::FencedRDTSC());
+}
+
+bool WallClock::IsNative() const {
+    if (invariant)
+        return false;
+    return true;
+}
+#elif defined(HAS_NCE)
+namespace {
+
+[[nodiscard]] WallClock::FactorType GetFixedPointFactor(u64 num, u64 den) noexcept {
+    return (WallClock::FactorType(num) << 64) / den;
+}
+
+[[nodiscard]] u64 MultiplyHigh(u64 m, WallClock::FactorType factor) noexcept {
+    return static_cast<u64>((m * factor) >> 64);
+}
+
+[[nodiscard]] s64 GetHostCNTFRQ() noexcept {
+    u64 cntfrq_el0 = 0;
+#ifdef ANDROID
+    std::string_view board{""};
+    char buffer[PROP_VALUE_MAX];
+    int len{__system_property_get("ro.product.board", buffer)};
+    board = std::string_view(buffer, static_cast<size_t>(len));
+    if (board == "s5e9925") { // Exynos 2200
+        cntfrq_el0 = 25600000;
+    } else if (board == "exynos2100") { // Exynos 2100
+        cntfrq_el0 = 26000000;
+    } else if (board == "exynos9810") { // Exynos 9810
+        cntfrq_el0 = 26000000;
+    } else if (board == "s5e8825") { // Exynos 1280
+        cntfrq_el0 = 26000000;
+    } else {
+        asm volatile("mrs %[cntfrq_el0], cntfrq_el0" : [cntfrq_el0] "=r"(cntfrq_el0));
+    }
+    return cntfrq_el0;
+#else
+    asm volatile("mrs %[cntfrq_el0], cntfrq_el0" : [cntfrq_el0] "=r"(cntfrq_el0));
+    return cntfrq_el0;
+#endif
+}
+
+} // namespace
+
+WallClock::WallClock(bool invariant_, u64 rdtsc_frequency_) noexcept {
+    const u64 host_cntfrq = std::max<u64>(GetHostCNTFRQ(), 1);
+    ns_cntfrq_factor = GetFixedPointFactor(NsRatio::den, host_cntfrq);
+    us_cntfrq_factor = GetFixedPointFactor(UsRatio::den, host_cntfrq);
+    ms_cntfrq_factor = GetFixedPointFactor(MsRatio::den, host_cntfrq);
+    guest_cntfrq_factor = GetFixedPointFactor(CNTFRQ, host_cntfrq);
+    gputick_cntfrq_factor = GetFixedPointFactor(GPUTickFreq, host_cntfrq);
+}
+
+std::chrono::nanoseconds WallClock::GetTimeNS() const {
+    return std::chrono::nanoseconds{MultiplyHigh(GetUptime(), ns_cntfrq_factor)};
+}
+
+std::chrono::microseconds WallClock::GetTimeUS() const {
+    return std::chrono::microseconds{MultiplyHigh(GetUptime(), us_cntfrq_factor)};
+}
+
+std::chrono::milliseconds WallClock::GetTimeMS() const {
+    return std::chrono::milliseconds{MultiplyHigh(GetUptime(), ms_cntfrq_factor)};
+}
+
+s64 WallClock::GetCNTPCT() const {
+    return MultiplyHigh(GetUptime(), guest_cntfrq_factor);
+}
+
+s64 WallClock::GetGPUTick() const {
+    return MultiplyHigh(GetUptime(), gputick_cntfrq_factor);
+}
+
+s64 WallClock::GetUptime() const {
+    s64 cntvct_el0 = 0;
+    asm volatile(
+        "dsb ish\n\t"
+        "mrs %[cntvct_el0], cntvct_el0\n\t"
+        "dsb ish\n\t"
+        : [cntvct_el0] "=r"(cntvct_el0)
+    );
+    return cntvct_el0;
+}
+
+bool WallClock::IsNative() const {
+    return true;
+}
+#else
+WallClock::WallClock(bool invariant_, u64 rdtsc_frequency_) noexcept {}
+
+std::chrono::nanoseconds WallClock::GetTimeNS() const {
+    return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch());
+}
+
+std::chrono::microseconds WallClock::GetTimeUS() const {
+    return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch());
+}
+
+std::chrono::milliseconds WallClock::GetTimeMS() const {
+    return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
+}
+
+s64 WallClock::GetCNTPCT() const {
+    return GetUptime() * NsToCNTPCTRatio::num / NsToCNTPCTRatio::den;
+}
+
+s64 WallClock::GetGPUTick() const {
+    return GetUptime() * NsToGPUTickRatio::num / NsToGPUTickRatio::den;
+}
+
+s64 WallClock::GetUptime() const {
+    return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
+}
+
+bool WallClock::IsNative() const {
+    return false;
+}
+#endif
+
+WallClock CreateOptimalClock() noexcept {
+#if defined(ARCHITECTURE_x86_64)
+    auto const& caps = GetCPUCaps();
+    return WallClock(!(caps.invariant_tsc && caps.tsc_frequency >= std::nano::den), caps.tsc_frequency);
+#elif defined(HAS_NCE)
+    return WallClock(false, 1);
+#else
+    return WallClock(true, 1);
+#endif
+}
+
+} // namespace Common
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lizzie	f1fdb389a4	fix movaps being evil	2026-05-24 19:03:16 +00:00
lizzie	21bb1b8210	[dynarmic] VEX encode movd/movq Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-05-24 18:47:11 +00:00