license

[common] use handrolled string utility conversions instead of wstring codecvt
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-08-15 13:16:43 +00:00 · 2026-03-24 23:19:38 +00:00 · 2026-03-24 23:16:45 +00:00
386 changed files with 16683 additions and 20060 deletions
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-_svg=dev.eden_emu.eden.svg
-_icon=dist/eden.icon
-_composed="$_icon/Assets/$_svg"
-_svg="dist/$_svg"
-
-rm "$_composed"
-cp "$_svg" "$_composed"
-
-xcrun actool "$_icon" \
-    --compile dist \
-    --platform macosx \
-    --minimum-deployment-target 11.0 \
-    --app-icon eden \
-    --output-partial-info-plist /dev/null
@@ -1,9 +1,10 @@
 name: tx-pull

 on:
-  #  tuesday, saturday at 2pm
+  # monday, wednesday, saturday at 2pm
  schedule:
-    - cron: '0 14 * * 2,6'
+    cron:
+      - '0 14 * * 1,3,6'
  workflow_dispatch:

 jobs:
@@ -58,3 +59,4 @@ jobs:
            -H 'Authorization: Bearer ${{ secrets.CI_FJ_TOKEN }}' \
            -H 'Content-Type: application/json' \
            -d "@data.json" --fail
+
@@ -0,0 +1,55 @@
+diff --git a/include/mcl/assert.hpp b/include/mcl/assert.hpp
+index f77dbe7..9ec0b9c 100644
+--- a/include/mcl/assert.hpp
+++ b/include/mcl/assert.hpp
+@@ -23,8 +23,11 @@ template<typename... Ts>
+
+ }  // namespace mcl::detail
+
+#ifndef UNREACHABLE
+ #define UNREACHABLE() ASSERT_FALSE("Unreachable code!")
+#endif
+
+#ifndef ASSERT
+ #define ASSERT(expr)                                                     \
+     [&] {                                                                \
+         if (std::is_constant_evaluated()) {                              \
+@@ -37,7 +40,9 @@ template<typename... Ts>
+             }                                                            \
+         }                                                                \
+     }()
+#endif
+
+#ifndef ASSERT_MSG
+ #define ASSERT_MSG(expr, ...)                                                \
+     [&] {                                                                    \
+         if (std::is_constant_evaluated()) {                                  \
+@@ -50,13 +55,24 @@ template<typename... Ts>
+             }                                                                \
+         }                                                                    \
+     }()
+#endif
+
+#ifndef ASSERT_FALSE
+ #define ASSERT_FALSE(...) ::mcl::detail::assert_terminate("false", __VA_ARGS__)
+#endif
+
+ #if defined(NDEBUG) || defined(MCL_IGNORE_ASSERTS)
+-#    define DEBUG_ASSERT(expr) ASSUME(expr)
+-#    define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr)
+#    ifndef DEBUG_ASSERT
+#        define DEBUG_ASSERT(expr) ASSUME(expr)
+#    endif
+#    ifndef DEBUG_ASSERT_MSG
+#        define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr)
+#    endif
+ #else
+-#    define DEBUG_ASSERT(expr) ASSERT(expr)
+-#    define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__)
+#    ifndef DEBUG_ASSERT
+#        define DEBUG_ASSERT(expr) ASSERT(expr)
+#    endif
+#    ifndef DEBUG_ASSERT_MSG
+#        define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__)
+#    endif
+ #endif
@@ -143,8 +143,8 @@ if (MSVC AND ARCHITECTURE_x86)
 endif()

 if (CXX_CLANG_CL)
-    # clang-cl prints literally 10000+ warnings without this
    add_compile_options(
+        # clang-cl prints literally 10000+ warnings without this
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-command-line-argument>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unsafe-buffer-usage>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-value>
@@ -154,12 +154,12 @@ if (CXX_CLANG_CL)
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>
        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>)
+
    # REQUIRED CPU features IN Windows-amd64
    if (ARCHITECTURE_x86_64)
        add_compile_options(
            $<$<COMPILE_LANGUAGE:C,CXX>:-msse4.1>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>
-        )
+            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>)
    endif()
 endif()

@@ -395,15 +395,13 @@ if (Boost_ADDED)
    if (NOT MSVC OR CXX_CLANG)
        # boost sucks
        if (PLATFORM_SUN)
-            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-pthreads>)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthreads")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthreads")
        endif()

-        target_compile_options(boost_heap INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>)
-        target_compile_options(boost_icl INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>)
-        target_compile_options(boost_asio INTERFACE
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough>
-        )
+        target_compile_options(boost_heap INTERFACE -Wno-shadow)
+        target_compile_options(boost_icl INTERFACE -Wno-shadow)
+        target_compile_options(boost_asio INTERFACE -Wno-conversion -Wno-implicit-fallthrough)
    endif()
 endif()

@@ -442,7 +440,7 @@ if (NOT YUZU_STATIC_ROOM)
    if (Opus_ADDED)
        if (MSVC AND CXX_CLANG)
            target_compile_options(opus PRIVATE
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-function-declaration>
+                -Wno-implicit-function-declaration
            )
        endif()
    endif()
@@ -486,10 +484,10 @@ endfunction()
 # =============================================

 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia)
-        find_library(${fw}_LIBRARY ${fw} REQUIRED)
-        list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
-    endforeach()
+    # Umbrella framework for everything GUI-related
+    find_library(COCOA_LIBRARY Cocoa REQUIRED)
+    find_library(IOKIT_LIBRARY IOKit REQUIRED)
+    set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
 elseif (WIN32)
    # Target Windows 10
    add_compile_definitions(_WIN32_WINNT=0x0A00 WINVER=0x0A00)
@@ -526,6 +524,7 @@ if (NOT YUZU_STATIC_ROOM)
    find_package(SPIRV-Tools)
    find_package(sirit)
    find_package(gamemode)
+    find_package(mcl)
    find_package(frozen)

    if (ARCHITECTURE_riscv64)
@@ -37,10 +37,10 @@ set(GIT_DESC ${BUILD_VERSION})

 # Auto-updater metadata! Must somewhat mirror GitHub API endpoint
 if (NIGHTLY_BUILD)
-    set(BUILD_AUTO_UPDATE_WEBSITE "https://git.eden-emu.dev")
-    set(BUILD_AUTO_UPDATE_API "git.eden-emu.dev")
-    set(BUILD_AUTO_UPDATE_API_PATH "/api/v1/repos/")
-    set(BUILD_AUTO_UPDATE_REPO "eden-ci/nightly")
+    set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com")
+    set(BUILD_AUTO_UPDATE_API "api.github.com")
+    set(BUILD_AUTO_UPDATE_API_PATH "/repos/")
+    set(BUILD_AUTO_UPDATE_REPO "Eden-CI/Nightly")
    set(REPO_NAME "Eden Nightly")
 else()
    set(BUILD_AUTO_UPDATE_WEBSITE "https://git.eden-emu.dev")
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:version="1.4.2 (ebf0e94, 2025-05-08)"
-   inkscape:export-filename="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient1"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:0.5;"
-         offset="0"
-         id="stop3" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:0.5;"
-         offset="0.44631511"
-         id="stop4" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:0.5;"
-         offset="0.90088946"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient138"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
-         offset="0"
-         id="stop152" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop137" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="swatch37"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37" />
-    </linearGradient>
-    <linearGradient
-       id="swatch28"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#252525;stop-opacity:1;"
-         offset="0"
-         id="stop28" />
-    </linearGradient>
-    <linearGradient
-       id="swatch27"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop27" />
-    </linearGradient>
-    <linearGradient
-       id="swatch15"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop16" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14"
-       inkscape:swatch="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop14" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop15" />
-    </linearGradient>
-    <linearGradient
-       id="swatch9"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop10" />
-    </linearGradient>
-    <linearGradient
-       id="swatch8"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9" />
-    </linearGradient>
-    <rect
-       x="22.627417"
-       y="402.76802"
-       width="521.34025"
-       height="248.94868"
-       id="rect24" />
-    <linearGradient
-       id="linearGradient11"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
-         offset="0"
-         id="stop11" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop154" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
-         id="stop12" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.118028,0,0,1.116699,-46.314723,-42.388667)"
-       x1="270.39996"
-       y1="40.000019"
-       x2="270.39996"
-       y2="494.39996"
-       spreadMethod="pad" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath18">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle18"
-         cx="-246.8315"
-         cy="246.8338"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath22">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle22"
-         cx="256"
-         cy="256"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient27"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6.9401139e-5,-2.8678628)"
-       x1="256.00012"
-       y1="102.94693"
-       x2="256.00012"
-       y2="409.05307" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath128">
-      <circle
-         style="fill:none;fill-opacity:1;stroke:#03ffff;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-         id="circle128"
-         cx="256"
-         cy="256"
-         r="192" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="256"
-       y1="64"
-       x2="256"
-       y2="448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3229974,0,0,1.3214002,-82.687336,-82.290326)" />
-  </defs>
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="261.62951"
-     inkscape:cy="230.87036"
-     inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="1080"
-     inkscape:window-y="351"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7" />
-  <path
-     id="path8-7"
-     style="display:inline;mix-blend-mode:multiply;fill:url(#linearGradient6);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2);stroke-width:3.9666;stroke-dasharray:none;stroke-opacity:0.566238;paint-order:stroke fill markers"
-     inkscape:label="Circle"
-     d="M 256,2.2792898 A 254.0155,253.71401 0 0 0 150.68475,25.115202 c 19.54414,1.070775 38.74692,5.250294 51.56848,11.647658 14.14361,7.056691 28.63804,19.185961 39.4212,29.347551 h 40.60981 c 1.03847,-0.68139 2.10297,-1.36938 3.1938,-2.05957 5.45602,-15.78533 14.79164,-43.183497 19.49612,-57.0097682 A 254.0155,253.71401 0 0 0 256,2.2792898 Z m 61.57106,7.567234 -18.26098,46.1544672 c 7.79702,-4.13918 16.35655,-7.87447 25.20671,-10.87081 23.1229,-7.828433 43.96931,-10.170904 54.94058,-10.868226 A 254.0155,253.71401 0 0 0 317.57106,9.8465238 Z m 65.39277,26.4001532 c -9.68256,4.806644 -33.05532,16.642034 -55.68217,29.863734 H 424.4677 A 254.0155,253.71401 0 0 0 382.96383,36.246677 Z M 113.90698,45.690231 A 254.0155,253.71401 0 0 0 87.532302,66.110411 H 194.2739 c -1.47402,-0.80231 -2.35141,-1.25949 -2.35141,-1.25949 l 10.4496,-11.83348 -38.40568,7.01234 c 0,1e-5 -12.21537,-4.60266 -40.17313,-12.27223 -3.45336,-0.94731 -6.75329,-1.61824 -9.8863,-2.06732 z m -36.803618,30.18635 a 254.0155,253.71401 0 0 0 -34.88372,43.090929 h 59.976738 c 18.11461,-12.04145 40.14252,-22.882149 62.31266,-24.534159 52.93006,-3.9444 70.16538,1.86342 70.16538,1.86342 0,0 -4.612,-4.8206 -14.51938,-13.36656 -2.72366,-2.34942 -6.0844,-4.77373 -9.52455,-7.05363 z m 174.472868,0 c 4.57322,4.7186 7.29716,7.83565 7.29716,7.83565 0,0 3.53501,-3.18484 9.62532,-7.83565 z m 60.27649,0 c -21.56573,15.45339 -25.4703,27.979669 -25.4703,27.979669 0,0 54.83326,-19.215729 100.70543,-0.31228 11.63986,4.79661 21.58481,10.13159 29.94832,15.42354 h 52.74419 A 254.0155,253.71401 0 0 0 434.89664,75.876581 Z M 36.250648,128.73367 A 254.0155,253.71401 0 0 0 16.372095,171.82459 H 147.45478 c 1.45695,-2.5815 3.06539,-5.08648 4.83979,-7.48982 14.23694,-19.28301 27.92088,-30.0088 36.86047,-35.6011 h -30.25323 c -5.87346,0.93472 -12.04945,1.99094 -18.28166,3.16937 -30.12936,5.69727 -81.157618,22.78945 -81.157618,22.78945 0,0 11.47125,-12.39249 29.11369,-25.95882 z m 265.630492,0 c 33.48676,11.2434 52.42799,26.78443 62.7752,43.09092 h 130.97157 a 254.0155,253.71401 0 0 0 -19.87856,-43.09092 h -44.81136 c 14.85233,11.5863 21.59948,20.9854 21.59948,20.9854 0,0 -33.5226,-12.37087 -66.0646,-20.9854 z m -45.96641,16.27007 c -1.00419,0.0106 -10.12705,0.72026 -44.98966,20.64729 -3.12132,1.78406 -6.25434,3.86182 -9.37468,6.17356 h 41.81911 c 7.17181,-17.34774 12.64083,-26.82085 12.64083,-26.82085 0,0 -0.0287,-7.1e-4 -0.0957,0 z m 14.18088,0.0465 c 0,0 -3.31228,9.32762 -7.30492,26.77438 h 51.78554 C 287.6577,146.14158 270.09561,145.0502 270.09561,145.0502 Z M 13.152456,181.59075 A 254.0155,253.71401 0 0 0 3.927651,224.68167 H 134.1447 c 0.56161,-12.72411 2.67825,-28.50188 8.61499,-43.09092 z m 176.661504,0 c -14.27121,13.10564 -27.60733,29.58761 -37.56073,43.09092 h 73.3721 c 4.47018,-16.79061 9.35068,-31.26371 13.86562,-43.09092 z m 70.85787,0 c -2.41384,11.76417 -4.9032,26.20707 -6.94831,43.09092 H 360.4832 c -8.32133,-10.88917 -20.66988,-26.17008 -36.35141,-43.09092 z m 109.17313,0 c 6.63611,15.24089 6.92441,30.5373 5.57882,43.09092 h 132.64857 a 254.0155,253.71401 0 0 0 -9.22481,-43.09092 z M 2.90181,234.44783 A 254.0155,253.71401 0 0 0 1.984498,255.9933 254.0155,253.71401 0 0 0 2.90181,277.53876 h 211.89923 c 2.25762,-15.52555 5.14325,-29.93448 8.3385,-43.09093 h -77.8863 c -6.46396,9.27617 -10.33076,15.56549 -10.33076,15.56549 0,0 -0.82623,-6.14945 -0.9354,-15.56549 z m 249.72093,0 c -1.3692,13.09684 -2.4456,27.49209 -3.02068,43.09093 h 259.49613 a 254.0155,253.71401 0 0 0 0.91731,-21.54546 254.0155,253.71401 0 0 0 -0.91731,-21.54547 H 374.02584 c -0.445,2.5469 -0.90878,4.89768 -1.32817,7.01751 0,0 -1.69726,-2.53821 -4.94056,-7.01751 z M 3.927651,287.30493 a 254.0155,253.71401 0 0 0 9.224805,43.09091 H 214.04393 c -1.29238,-15.40742 -1.57503,-30.04388 -0.41861,-43.09091 z m 245.385009,0 c -0.30355,13.54349 -0.22032,27.92598 0.36951,43.09091 h 249.16537 a 254.0155,253.71401 0 0 0 9.22481,-43.09091 z M 16.369511,340.16201 a 254.0155,253.71401 0 0 0 19.878554,43.09091 H 221.4677 c -2.69781,-14.4523 -4.96108,-29.01285 -6.4832,-43.09091 z m 233.842379,0 c 1.15864,15.47765 3.81286,29.83979 7.51679,43.09091 h 218.02325 a 254.0155,253.71401 0 0 0 19.87856,-43.09091 z M 42.217052,393.01909 a 254.0155,253.71401 0 0 0 34.88372,43.09093 H 233.09561 c -3.40902,-13.67281 -6.76794,-28.2531 -9.73902,-43.09093 z m 218.490958,0 c 5.34985,16.15926 12.22007,30.51982 19.68733,43.09093 h 154.50389 a 254.0155,253.71401 0 0 0 34.88371,-43.09093 z M 87.529722,445.87618 a 254.0155,253.71401 0 0 0 166.229968,63.8208 c -3.67805,-12.0825 -10.85464,-35.49828 -18.18088,-63.8208 z m 199.010328,0 c 17.5887,26.43772 36.99259,43.60598 47.33592,51.61309 a 254.0155,253.71401 0 0 0 90.59431,-51.61309 z" />
-  <path
-     id="path27"
-     style="display:inline;mix-blend-mode:multiply;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient27);stroke-width:3;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 318.98012,441.7375 c -9.87518,-6.73978 -64.39137,-49.0272 -67.68975,-127.81978 -3.69298,-88.21893 15.36468,-141.91029 15.36468,-141.91029 0,0 16.00378,0.99513 39.80316,26.53195 23.79939,25.53753 37.74965,46.43102 37.74965,46.43102 3.91262,-19.79992 12.84563,-66.32402 -60.72865,-87.55523 0,0 12.82326,-5.38883 39.3925,-3.81382 26.56907,1.57572 81.6822,21.93799 81.6822,21.93799 0,0 -14.79766,-20.63773 -49.47063,-34.94295 -34.67291,-14.30533 -76.1182,0.23644 -76.1182,0.23644 0,0 3.86959,-12.43127 27.22669,-26.38478 23.35718,-13.9537 49.27409,-26.501533 49.27409,-26.501533 0,0 -21.97854,-0.26548 -47.67725,8.44535 -6.68948,2.267506 -13.15863,5.094213 -19.05208,8.226563 l 16.05803,-40.634103 -4.4617,-1.89059 -5.1305,-0.95965 c 0,0 -11.24072,33.12428 -16.92051,49.576513 -12.13137,7.68489 -20.11005,14.87735 -20.11005,14.87735 0,0 -21.90573,-25.09227 -42.79668,-35.527803 -26.03412,-13.00525 -86.88249,-13.90359 -94.0044,10.401173 0,0 13.56804,-7.884703 34.70032,-2.080917 21.13214,5.803997 30.3644,9.287307 30.3644,9.287307 l 29.02989,-5.30681 -7.89811,8.95527 c 0,0 13.8496,7.21324 21.33822,13.68063 7.48859,6.46722 10.9757,10.11472 10.9757,10.11472 0,0 -13.02739,-4.39388 -53.03507,-1.40893 -40.00771,2.98473 -79.40016,45.60209 -79.40016,45.60209 0,0 38.57037,-12.93531 61.34393,-17.24677 22.77354,-4.31126 44.52166,-6.46757 44.52166,-6.46757 0,0 -17.23298,5.97003 -35.69792,31.00932 -18.46522,25.03987 -13.13146,64.83866 -13.13146,64.83866 0,0 29.33874,-47.7577 57.44675,-63.84249 28.10798,-16.08527 34.0799,-15.6238 34.0799,-15.6238 0,0 -22.56785,39.13486 -31.39017,101.98268 -8.03005,57.2039 26.77689,163.75449 31.1572,178.89699"
-     sodipodi:nodetypes="cscsccscscscsccccccscscccscscscscscsc"
-     inkscape:label="MainOutline"
-     clip-path="url(#clipPath128)"
-     transform="matrix(1.3229974,0,0,1.3214002,-82.687282,-82.278451)" />
-</svg>
@@ -1,37 +0,0 @@
-{
-  "fill" : {
-    "automatic-gradient" : "srgb:0.00000,0.00000,0.00000,1.00000"
-  },
-  "groups" : [
-    {
-      "layers" : [
-        {
-          "fill" : "none",
-          "image-name" : "dev.eden_emu.eden.svg",
-          "name" : "dev.eden_emu.eden",
-          "position" : {
-            "scale" : 1.8,
-            "translation-in-points" : [
-              0,
-              0
-            ]
-          }
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}
@@ -1 +0,0 @@
-#43fcfcff
@@ -76,6 +76,7 @@ Certain other dependencies will be fetched by CPM regardless. System packages *c
  * This package is known to be broken on the AUR.
 * [cpp-jwt](https://github.com/arun11299/cpp-jwt) 1.4+ - if `ENABLE_WEB_SERVICE` is on
 * [unordered-dense](https://github.com/martinus/unordered_dense)
+* [mcl](https://github.com/azahar-emu/mcl) - subject to removal

 On amd64:

@@ -334,7 +335,7 @@ pacman -Syuu --needed --noconfirm $packages
 <summary>HaikuOS</summary>

 ```sh
-pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.90_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel
+pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.89_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel
 ```

 [Caveats](./Caveats.md#haikuos).
@@ -16,7 +16,6 @@ This contains documentation created by developers. This contains build instructi
 - **[Dynarmic](./dynarmic)**
 - **[Cross compilation](./CrossCompile.md)**
 - **[Driver Bugs](./DriverBugs.md)**
- **[Building Older Commits](./build/OlderCommits.md)**

 ## Policies

@@ -1,40 +0,0 @@
-# Building Older Commits
-
-Bisecting and debugging older versions of Eden can be difficult, as many of our submodules have been deleted or removed. However, work has been done to make this process as simple as possible for users.
-
-## Script
-
-Copy the following script and store it in `fix.sh`:
-
-```sh
-#!/bin/sh -e
-
-git -C externals/discord-rpc checkout 0d8b2d6a37c6e47d62b37caa14708bf747c883bb
-git add externals/discord-rpc
-
-git -C externals/dynarmic checkout 05b7ba50588d1004e23ef91f1bda8be234be68f4
-git add externals/dynarmic
-
-git -C externals/mbedtls checkout ce4f81f4a926a0e0dcadd0128e016baba416e8ea
-git add externals/mbedtls
-
-git -C externals/oboe checkout e4f06f2143eb0173bf4a2bd15aae5e8cc3179405
-git add externals/oboe
-
-git -C externals/sirit checkout b870b062998244231a4f08004d3b25151732c5c5
-git add externals/sirit
-```
-
-Then, run `chmod +x fix.sh`
-
-## Submodules
-
-To check out submodules successfully, use this order of operations:
-
-```sh
-git submodule update --init --recursive --depth 1 --jobs 8 --progress
-./fix.sh
-git submodule update --init --recursive --depth 1 --jobs 8 --progress
-```
-
-And you should be good to go! If you check out a different commit that changes submodule commits, run the above command list again.
@@ -56,7 +56,7 @@ Use this when you need to connect to a multiplayer room for LDN functionality in
 - Multiplayer Options Configured in Eden Settings
 - Network Access

-### Steps
+## Steps
 There are 2 primary methods that you can use to connect to an existing room, depending on how the room is hosted.

 - Joining a Public Lobby
@@ -70,7 +70,7 @@ There are 2 primary methods that you can use to connect to an existing room, dep

 </aside>

-## Joining a Public Lobby
+### Joining a Public Lobby
 1. Open Eden and navigate to *Multiplayer → Browse Public Game Lobby*.
 2. The **Public Room Browser** will now open and display a list of publicly accessible rooms.  Find one you want to connect to and double click it.
    
@@ -90,7 +90,7 @@ If the hoster has not made the lobby public, or you don't want to find it in the

 ---

-## Hosting a Multiplayer Room
+# Hosting a Multiplayer Room
 Use this guide for when you want to host a multiplayer lobby to play with others in Eden.  In order to have someone access the room from outside your local network, see the *Access Your Multiplayer Room Externally* section for next steps.

 **Click [Here](https://evilperson1337.notion.site/Hosting-a-Multiplayer-Room-2c357c2edaf6819481dbe8a99926cea2) for a version of this guide with images & visual elements.**
@@ -100,7 +100,7 @@ Use this guide for when you want to host a multiplayer lobby to play with others
 - Network Access
 - Ability to allow programs through the firewall on your device.

-### Steps
+## Steps
 1. Open Eden and navigate to *Emulation → Multiplayer → Create Room.*    
 2. Fill out the following information in the popup dialog box.
    
@@ -120,7 +120,7 @@ Use this guide for when you want to host a multiplayer lobby to play with others

 ---

-## Access Your Multiplayer Room Externally
+# Access Your Multiplayer Room Externally
 Quite often the person with whom you want to play is located off of your internal network (LAN).  If you want to host a room and play with them you will need to get your devices to communicate with each other.  This guide will go over your options on how to do this so that you can play together.

 **Click [Here](https://evilperson1337.notion.site/Access-Your-Multiplayer-Room-Externally-2c357c2edaf681c0ab2ce2ee624d809d) for a version of this guide with images & visual elements.**
@@ -129,9 +129,9 @@ Quite often the person with whom you want to play is located off of your interna
 - Eden set up and Functioning
 - Network Access

-### Options
+## Options

-#### Port Forwarding
+### Port Forwarding

 - **Difficulty Level**: High
    
@@ -148,9 +148,8 @@ The process works by creating a static mapping—often called a “port-forward

 For our purposes we would pick the port we want to expose (*e.g. 24872*) and we would access our router's configuration and create a port-forward rule to send the traffic from an external connection to your local machine over our specified port (*24872)*.  The exact way to do so, varies greatly by router manufacturer - and sometimes require contacting your ISP to do so depending on your agreement.  You can look up your router on [*portforward.com*](https://portforward.com/router.htm) which may have instructions on how to do so for your specific equipment.  If it is not there, you will have to use Google/ChatGPT to determine the steps for your equipment.

-Remember you can't have one port open for multiple devices at the same time - you must only host from one device (or do more convoluted networking which we will not cover here).

-#### Use a Tunnelling Service
+### Use a Tunnelling Service
 - **Difficulty Level**: Easy
    
    <aside>
@@ -168,7 +167,7 @@ For our purposes we would spawn the listener for the port that way chose when ho
 - [*Playit.GG*](https://playit.gg/)


-#### Use a VPN Service
+### Use a VPN Service

 - **Difficulty**: Easy

@@ -190,7 +189,7 @@ The VPN solution is a good compromise between the tunnelling solution and port f

 ---

-## Finding the Server Information for a Multiplayer Room
+# Finding the Server Information for a Multiplayer Room
 Use this guide when you need to determine the connection information for the Public Multiplayer Lobby you are connected to.

 **Click [Here](https://evilperson1337.notion.site/Finding-the-Server-Information-for-a-Multiplayer-Room-2c557c2edaf6809e94e8ed3429b9eb26) for a version of this guide with images & visual elements.**
@@ -199,7 +198,7 @@ Use this guide when you need to determine the connection information for the Pub
 - Eden set up and configured
 - Internet Access

-### Steps
+## Steps

 ### Method 1: Grabbing the Address from the Log File
 1. Open Eden and Connect to the room you want to identify.
@@ -223,7 +222,7 @@ Use this guide when you need to determine the connection information for the Pub
 2. Open the terminal supported by your operating system.
 3. Run one of the following commands, replacing *<Name>* with the name of the server from step 1.
    
-    #### PowerShell Command [Windows Users]
+    ### PowerShell Command [Windows Users]
    
    ```powershell
    # Calls the API to get the address and port information
@@ -236,7 +235,7 @@ Use this guide when you need to determine the connection information for the Pub
    #}
    ```
    
-    #### CURL Command [MacOS/Linux Users] **Requires jq*
+    ### CURL Command [MacOS/Linux Users] **Requires jq*
    
    ```bash
    # Calls the API to get the address and port information
@@ -253,7 +252,7 @@ Use this guide when you need to determine the connection information for the Pub

 ---

-## Multiplayer for Local Co-Op Games
+# Multiplayer for Local Co-Op Games
 Use this guide when you want to play with a friend on a different system for games that only support local co-op.

 **Click [Here](https://evilperson1337.notion.site/Multiplayer-for-Local-Co-Op-Games-2c657c2edaf680c59975ec6b52022a2d) for a version of this guide with images & visual elements.**
@@ -272,7 +271,7 @@ In either situation at its core, we are emulating an input device on the host ma
    - Parsec is free to use for personal, non-commercial use.  For instructions on how to set up an account and install the client you should refer to the Parsec documentation on it's site.
 - Parsec client installed on your machine and remote (friend's) machine

-### Steps
+## Steps

 <aside>

@@ -295,22 +294,3 @@ This guide will assume you are the one hosting the game and go over things *Pars
 10. Set up the remote player's controller.
 11. Hit **OK** to apply the changes.
 12. Launch the game you want to play and enter the co-op mode.  How this works depends on the game, so you will have to look in the menus or online to find out.
-
-## Metaserver troubleshooting
-
-If you can't connect to the metaserver, it's likely your ISP is blocking the requests.
-
-### Linux and Steamdeck
-
-Most Linux systems and Steamdeck should allow to modify the base `/etc/hosts` file, this should fix the DNS lookup issue; hence add the following to said file:
-```
-28.165.181.135 api.ynet-fun.xyz api.ynet-fun.xyz
-```
-
-### Zapret
-
-In `lists/list-general.txt` add the following:
-```
-api.ynet-fun.xyz
-ynet-fun.xyz
-```
@@ -62,12 +62,6 @@ endif()
 # unordered_dense
 AddJsonPackage(unordered-dense)

-# httplib
-if (IOS)
-    set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
-endif()
-AddJsonPackage(httplib)
-
 if (YUZU_STATIC_ROOM)
    return()
 endif()
@@ -82,6 +76,9 @@ if (ARCHITECTURE_riscv64)
    AddJsonPackage(biscuit)
 endif()

+# mcl
+AddJsonPackage(mcl)
+
 # Vulkan stuff
 AddDependentPackages(vulkan-headers vulkan-utility-libraries)

@@ -112,15 +109,16 @@ if(ENABLE_CUBEB)
    if (cubeb_ADDED)
        if (NOT MSVC)
            if (TARGET speex)
-                target_compile_options(speex PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-compare>)
+                target_compile_options(speex PRIVATE -Wno-sign-compare)
            endif()
+
            set_target_properties(cubeb PROPERTIES COMPILE_OPTIONS "")
            target_compile_options(cubeb INTERFACE
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-const-int-float-conversion>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-declarations>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-return-type>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-uninitialized>
+                -Wno-implicit-const-int-float-conversion
+                -Wno-shadow
+                -Wno-missing-declarations
+                -Wno-return-type
+                -Wno-uninitialized
            )
        else()
            target_compile_options(cubeb PRIVATE
@@ -186,9 +184,7 @@ if (YUZU_USE_BUNDLED_SIRIT)
 else()
    AddJsonPackage(sirit)
    if(MSVC AND CXX_CLANG)
-        target_compile_options(siritobj PRIVATE
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-error=unused-command-line-argument>
-        )
+        target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
    endif()
 endif()

@@ -224,7 +220,7 @@ AddJsonPackage(vulkan-memory-allocator)
 if (VulkanMemoryAllocator_ADDED)
    if (CXX_CLANG)
        target_compile_options(VulkanMemoryAllocator INTERFACE
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable>
+            -Wno-unused-variable
        )
    elseif(MSVC)
        target_compile_options(VulkanMemoryAllocator INTERFACE
@@ -233,6 +229,9 @@ if (VulkanMemoryAllocator_ADDED)
    endif()
 endif()

+# httplib
+AddJsonPackage(httplib)
+
 # cpp-jwt
 if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
    AddJsonPackage(cpp-jwt)
@@ -30,15 +30,13 @@
        "tag": "v%VERSION%",
        "hash": "5efa8140aadffe105dcf39935b732476e95755f6c7473ada3d0b64df2bc02c557633ae3948a25b45e1cf67e89a3ff6329fb30362e4ac033b9a1d1e453aa2eded",
        "git_version": "0.37.0",
-        "version": "0.18.7",
        "find_args": "MODULE GLOBAL",
        "patches": [
            "0001-mingw.patch",
            "0002-fix-zstd.patch"
        ],
        "options": [
-            "HTTPLIB_REQUIRE_OPENSSL ON",
-            "HTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES ON"
+            "HTTPLIB_REQUIRE_OPENSSL ON"
        ]
    },
    "cpp-jwt": {
@@ -210,6 +208,18 @@
        "version": "0.9.1",
        "git_version": "0.19.0"
    },
+    "mcl": {
+        "version": "0.1.12",
+        "repo": "azahar-emu/mcl",
+        "sha": "7b08d83418",
+        "hash": "9c6ba624cb22ef622f78046a82abb99bf5026284ba17dfacaf46ac842cbd3b0f515f5ba45a1598c7671318a78a2e648db72ce8d10e7537f34e39800bdcb57694",
+        "options": [
+            "MCL_INSTALL OFF"
+        ],
+        "patches": [
+            "0001-assert-macro.patch"
+        ]
+    },
    "libusb": {
        "repo": "libusb/libusb",
        "tag": "v%VERSION%",
@@ -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: 2020 yuzu Emulator Project
@@ -232,7 +232,7 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
        )
        find_package(Threads REQUIRED)
        if(THREADS_HAVE_PTHREAD_ARG)
-          target_compile_options(usb PUBLIC $<$<COMPILE_LANGUAGE:C,CXX>:-pthread>)
+          target_compile_options(usb PUBLIC "-pthread")
        endif()
        if(CMAKE_THREAD_LIBS_INIT)
          target_link_libraries(usb PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
@@ -8,7 +8,7 @@
 include_directories(.)

 # Dynarmic
-if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64) AND NOT YUZU_STATIC_ROOM)
+if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 AND NOT YUZU_STATIC_ROOM)
    add_subdirectory(dynarmic)
    add_library(dynarmic::dynarmic ALIAS dynarmic)
 endif()
@@ -118,42 +118,47 @@ if (MSVC AND NOT CXX_CLANG)
 else()
    if (NOT MSVC)
        add_compile_options(
-            $<$<COMPILE_LANGUAGE:C,CXX>:-fwrapv>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-pipe>
-            # Disable RTTI (C++ only)
-            $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
+            -fwrapv
+            -fno-rtti # Disable RTTI
+            -pipe
+        )
    endif()

    add_compile_options(
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=all>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=extra>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=missing-declarations>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unused>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-attributes>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-invalid-offsetof>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
+        -Werror=all
+        -Werror=extra
+        -Werror=missing-declarations
+        -Werror=shadow
+        -Werror=unused
+
+        -Wno-attributes
+        -Wno-invalid-offsetof
+        -Wno-unused-parameter
+        -Wno-missing-field-initializers
+    )

    if (CXX_CLANG OR CXX_ICC OR CXX_APPLE) # Clang, AppleClang, or Intel C++
        if (NOT MSVC)
            add_compile_options(
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow-uncaptured-local>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=implicit-fallthrough>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=type-limits>)
+                -Werror=shadow-uncaptured-local
+                -Werror=implicit-fallthrough
+                -Werror=type-limits
+            )
        endif()
+
        add_compile_options(
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-braced-scalar-init>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-private-field>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-nullability-completeness>)
+            -Wno-braced-scalar-init
+            -Wno-unused-private-field
+            -Wno-nullability-completeness
+        )
    endif()

    if (ARCHITECTURE_x86_64)
-        add_compile_options(-mcx16)
+        add_compile_options("-mcx16")
    endif()

    if (APPLE AND CXX_CLANG)
-        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-stdlib=libc++>)
+        add_compile_options("-stdlib=libc++")
    endif()

    # GCC bugs
@@ -161,9 +166,10 @@ else()
        # These diagnostics would be great if they worked, but are just completely broken
        # and produce bogus errors on external libraries like fmt.
        add_compile_options(
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-array-bounds>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overread>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overflow>)
+            -Wno-array-bounds
+            -Wno-stringop-overread
+            -Wno-stringop-overflow
+        )
    endif()

    # Set file offset size to 64 bits.
@@ -25,11 +25,6 @@ import android.hardware.SensorEventListener
 import android.hardware.SensorManager
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import androidx.navigation.NavOptions
-import org.yuzu.yuzu_emu.fragments.EmulationFragment
-import org.yuzu.yuzu_emu.utils.CustomSettingsHandler
 import android.util.Rational
 import android.view.InputDevice
 import android.view.KeyEvent
@@ -92,28 +87,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    private val emulationViewModel: EmulationViewModel by viewModels()

    private var foregroundService: Intent? = null
-    private val mainHandler = Handler(Looper.getMainLooper())
-    private var pendingRomSwapIntent: Intent? = null
-    private var isWaitingForRomSwapStop = false
-    private var romSwapNativeStopped = false
-    private var romSwapThreadStopped = false
-    private var romSwapGeneration = 0
-    private var hasEmulationSession = processHasEmulationSession
-    private val romSwapStopTimeoutRunnable = Runnable { onRomSwapStopTimeout() }
-
-    private fun onRomSwapStopTimeout() {
-        if (!isWaitingForRomSwapStop) {
-            return
-        }
-        Log.warning("[EmulationActivity] ROM swap stop timed out; retrying native stop and continuing to wait")
-        NativeLibrary.stopEmulation()
-        scheduleRomSwapStopTimeout()
-    }
-
-    private fun scheduleRomSwapStopTimeout() {
-        mainHandler.removeCallbacks(romSwapStopTimeoutRunnable)
-        mainHandler.postDelayed(romSwapStopTimeoutRunnable, ROM_SWAP_STOP_TIMEOUT_MS)
-    }

    override fun attachBaseContext(base: Context) {
        super.attachBaseContext(YuzuApplication.applyLanguage(base))
@@ -155,29 +128,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
        binding = ActivityEmulationBinding.inflate(layoutInflater)
        setContentView(binding.root)

-        val launchIntent = Intent(intent)
-        val shouldDeferLaunchForSwap = hasEmulationSession && isSwapIntent(launchIntent)
-        if (shouldDeferLaunchForSwap) {
-            Log.info("[EmulationActivity] onCreate detected existing session; deferring new game setup for swap")
-            emulationViewModel.setIsEmulationStopping(true)
-            emulationViewModel.setEmulationStopped(false)
-        }
-
        val navHostFragment =
            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
-        val initialArgs = if (shouldDeferLaunchForSwap) {
-            Bundle(intent.extras ?: Bundle()).apply {
-                processSessionGame?.let { putParcelable("game", it) }
-            }
-        } else {
-            intent.extras
-        }
-        navHostFragment.navController.setGraph(R.navigation.emulation_navigation, initialArgs)
-        if (shouldDeferLaunchForSwap) {
-            mainHandler.post {
-                handleSwapIntent(launchIntent)
-            }
-        }
+        navHostFragment.navController.setGraph(R.navigation.emulation_navigation, intent.extras)

        isActivityRecreated = savedInstanceState != null

@@ -257,7 +210,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    }

    override fun onDestroy() {
-        mainHandler.removeCallbacks(romSwapStopTimeoutRunnable)
        super.onDestroy()
        inputManager.unregisterInputDeviceListener(this)
        stopForegroundService(this)
@@ -276,121 +228,15 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager

    override fun onNewIntent(intent: Intent) {
        super.onNewIntent(intent)
-        handleSwapIntent(intent)
-        nfcReader.onNewIntent(intent)
-        InputHandler.updateControllerData()
-    }
+        setIntent(intent)

-    private fun isSwapIntent(intent: Intent): Boolean {
-        return when {
-            intent.getBooleanExtra(EXTRA_OVERLAY_GAMELESS_EDIT_MODE, false) -> false
-            intent.action == CustomSettingsHandler.CUSTOM_CONFIG_ACTION -> true
-            intent.data != null -> true
-            else -> {
-                val extras = intent.extras
-                extras != null &&
-                    BundleCompat.getParcelable(extras, EXTRA_SELECTED_GAME, Game::class.java) != null
-            }
-        }
-    }
-
-    private fun handleSwapIntent(intent: Intent) {
-        if (!isSwapIntent(intent)) {
-            return
-        }
-
-            pendingRomSwapIntent = Intent(intent)
-
-            if (!isWaitingForRomSwapStop) {
-                Log.info("[EmulationActivity] Begin ROM swap: data=${intent.data}")
-                isWaitingForRomSwapStop = true
-                romSwapNativeStopped = false
-                romSwapThreadStopped = false
-                romSwapGeneration += 1
-                val thisSwapGeneration = romSwapGeneration
-                emulationViewModel.setIsEmulationStopping(true)
-                emulationViewModel.setEmulationStopped(false)
-                val navHostFragment =
-                    supportFragmentManager.findFragmentById(R.id.fragment_container) as? NavHostFragment
-                val childFragmentManager = navHostFragment?.childFragmentManager
-                val stoppingFragmentForSwap =
-                    (childFragmentManager?.primaryNavigationFragment as? EmulationFragment) ?:
-                    childFragmentManager
-                        ?.fragments
-                        ?.asReversed()
-                        ?.firstOrNull {
-                            it is EmulationFragment &&
-                                it.isAdded &&
-                            it.view != null &&
-                            !it.isRemoving
-                        } as? EmulationFragment
-
-                val hasSessionForSwap = hasEmulationSession || stoppingFragmentForSwap != null
-
-                if (!hasSessionForSwap) {
-                    romSwapNativeStopped = true
-                    romSwapThreadStopped = true
-                } else {
-                    if (stoppingFragmentForSwap != null) {
-                        stoppingFragmentForSwap.stopForRomSwap()
-                        stoppingFragmentForSwap.notifyWhenEmulationThreadStops {
-                            if (!isWaitingForRomSwapStop || romSwapGeneration != thisSwapGeneration) {
-                                return@notifyWhenEmulationThreadStops
-                            }
-                            romSwapThreadStopped = true
-                            Log.info("[EmulationActivity] ROM swap thread stop acknowledged")
-                            launchPendingRomSwap(force = false)
-                        }
-                    } else {
-                        Log.warning("[EmulationActivity] ROM swap stop target fragment not found; requesting native stop")
-                        romSwapThreadStopped = true
-                        NativeLibrary.stopEmulation()
-                    }
-
-                    scheduleRomSwapStopTimeout()
-                }
-            }
-
-            launchPendingRomSwap(force = false)
-    }
-
-    private fun launchPendingRomSwap(force: Boolean) {
-        if (!isWaitingForRomSwapStop) {
-            return
-        }
-        if (!force && (!romSwapNativeStopped || !romSwapThreadStopped)) {
-            return
-        }
-        val swapIntent = pendingRomSwapIntent ?: return
-        Log.info("[EmulationActivity] Launching pending ROM swap: data=${swapIntent.data}")
-        pendingRomSwapIntent = null
-        isWaitingForRomSwapStop = false
-        romSwapNativeStopped = false
-        romSwapThreadStopped = false
-        mainHandler.removeCallbacks(romSwapStopTimeoutRunnable)
-        applyGameLaunchIntent(swapIntent)
-    }
-
-    private fun applyGameLaunchIntent(intent: Intent) {
-        hasEmulationSession = true
-        processHasEmulationSession = true
-        emulationViewModel.setIsEmulationStopping(false)
-        emulationViewModel.setEmulationStopped(false)
-        setIntent(Intent(intent))
+        // Reset navigation graph with new intent data to recreate EmulationFragment
        val navHostFragment =
            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
-        val navController = navHostFragment.navController
-        val startArgs = intent.extras?.let { Bundle(it) } ?: Bundle()
-        val navOptions = NavOptions.Builder()
-            .setPopUpTo(R.id.emulationFragment, true)
-            .build()
+        navHostFragment.navController.setGraph(R.navigation.emulation_navigation, intent.extras)

-        runCatching {
-            navController.navigate(R.id.emulationFragment, startArgs, navOptions)
-        }.onFailure {
-            Log.warning("[EmulationActivity] ROM swap navigate fallback to setGraph: ${it.message}")
-            navController.setGraph(R.navigation.emulation_navigation, startArgs)
-        }
+        nfcReader.onNewIntent(intent)
+        InputHandler.updateControllerData()
    }

    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
@@ -762,48 +608,19 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    }

    fun onEmulationStarted() {
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            mainHandler.post { onEmulationStarted() }
-            return
-        }
-        hasEmulationSession = true
-        processHasEmulationSession = true
        emulationViewModel.setEmulationStarted(true)
-        emulationViewModel.setIsEmulationStopping(false)
-        emulationViewModel.setEmulationStopped(false)
        NativeLibrary.playTimeManagerStart()

    }

    fun onEmulationStopped(status: Int) {
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            mainHandler.post { onEmulationStopped(status) }
-            return
-        }
-        hasEmulationSession = false
-        processHasEmulationSession = false
-        if (isWaitingForRomSwapStop) {
-            romSwapNativeStopped = true
-            Log.info("[EmulationActivity] ROM swap native stop acknowledged")
-            launchPendingRomSwap(force = false)
-        } else if (status == 0 && emulationViewModel.programChanged.value == -1) {
-            processSessionGame = null
+        if (status == 0 && emulationViewModel.programChanged.value == -1) {
            finish()
-        } else if (!isWaitingForRomSwapStop) {
-            processSessionGame = null
        }
        emulationViewModel.setEmulationStopped(true)
    }

-    fun updateSessionGame(game: Game?) {
-        processSessionGame = game
-    }
-
    fun onProgramChanged(programIndex: Int) {
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            mainHandler.post { onProgramChanged(programIndex) }
-            return
-        }
        emulationViewModel.setProgramChanged(programIndex)
    }

@@ -827,11 +644,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    companion object {
        const val EXTRA_SELECTED_GAME = "SelectedGame"
        const val EXTRA_OVERLAY_GAMELESS_EDIT_MODE = "overlayGamelessEditMode"
-        private const val ROM_SWAP_STOP_TIMEOUT_MS = 5000L
-        @Volatile
-        private var processHasEmulationSession = false
-        @Volatile
-        private var processSessionGame: Game? = null

        fun stopForegroundService(activity: Activity) {
            val startIntent = Intent(activity, ForegroundService::class.java)
@@ -29,6 +29,7 @@ import org.yuzu.yuzu_emu.databinding.FragmentDriverManagerBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen
+import org.yuzu.yuzu_emu.model.Driver.Companion.toDriver
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.FileUtil
@@ -215,23 +216,19 @@ class DriverManagerFragment : Fragment() {

                val driverData = GpuDriverHelper.getMetadataFromZip(driverFile)
                val driverInList =
-                    driverViewModel.driverData.firstOrNull {
-                        it.first == driverPath || it.second == driverData
-                    }
+                    driverViewModel.driverData.firstOrNull { it.second == driverData }
                if (driverInList != null) {
                    return@newInstance getString(R.string.driver_already_installed)
                } else {
                    driverViewModel.onDriverAdded(Pair(driverPath, driverData))
                    withContext(Dispatchers.Main) {
                        if (_binding != null) {
-                            refreshDriverList()
                            val adapter = binding.listDrivers.adapter as DriverAdapter
-                            val selectedPosition = adapter.currentList
-                                .indexOfFirst { it.selected }
-                                .let { if (it == -1) 0 else it }
+                            adapter.addItem(driverData.toDriver())
+                            adapter.selectItem(adapter.currentList.indices.last)
                            driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global)
                            binding.listDrivers
-                                .smoothScrollToPosition(selectedPosition)
+                                .smoothScrollToPosition(adapter.currentList.indices.last)
                        }
                    }
                }
@@ -50,7 +50,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
-import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.navArgs
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
@@ -136,8 +135,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

    private var intentGame: Game? = null
    private var isCustomSettingsIntent = false
-    private var isStoppingForRomSwap = false
-    private var deferGameSetupUntilStopCompletes = false

    private var perfStatsRunnable: Runnable? = null
    private var socRunnable: Runnable? = null
@@ -241,14 +238,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            }
        }

-        if (emulationViewModel.isEmulationStopping.value) {
-            deferGameSetupUntilStopCompletes = true
-            if (game == null) {
-                game = args.game ?: intentGame
-            }
-            return
-        }
-
        finishGameSetup()
    }

@@ -271,7 +260,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            }

            game = gameToUse
-            emulationActivity?.updateSessionGame(gameToUse)
        } catch (e: Exception) {
            Log.error("[EmulationFragment] Error during game setup: ${e.message}")
            Toast.makeText(
@@ -346,8 +334,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        }

        emulationState = EmulationState(game!!.path) {
-            return@EmulationState driverViewModel.isInteractionAllowed.value &&
-                !isStoppingForRomSwap
+            return@EmulationState driverViewModel.isInteractionAllowed.value
        }
    }

@@ -903,12 +890,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            }
        )

-        game?.let {
-            GameIconUtils.loadGameIcon(it, binding.loadingImage)
-            binding.loadingTitle.text = it.title
-        } ?: run {
-            binding.loadingTitle.text = ""
-        }
+        GameIconUtils.loadGameIcon(game!!, binding.loadingImage)
+        binding.loadingTitle.text = game!!.title
        binding.loadingTitle.isSelected = true
        binding.loadingText.isSelected = true

@@ -976,12 +959,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                ViewUtils.showView(binding.loadingIndicator)
                ViewUtils.hideView(binding.inputContainer)
                ViewUtils.hideView(binding.showStatsOverlayText)
-            } else if (deferGameSetupUntilStopCompletes) {
-                if (!isAdded) {
-                    return@collect
-                }
-                deferGameSetupUntilStopCompletes = false
-                finishGameSetup()
            }
        }
        emulationViewModel.drawerOpen.collect(viewLifecycleOwner) {
@@ -1018,24 +995,26 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        }

        driverViewModel.isInteractionAllowed.collect(viewLifecycleOwner) {
-            if (it &&
-                !isStoppingForRomSwap &&
-                !NativeLibrary.isRunning() &&
-                !NativeLibrary.isPaused()
-            ) {
-                if (!DirectoryInitialization.areDirectoriesReady) {
-                    DirectoryInitialization.start()
-                }
-
-                updateScreenLayout()
-
-                emulationState.run(emulationActivity!!.isActivityRecreated)
+            if (it && !NativeLibrary.isRunning() && !NativeLibrary.isPaused()) {
+                startEmulation()
            }
        }

        driverViewModel.onLaunchGame()
    }

+    private fun startEmulation(programIndex: Int = 0) {
+        if (!NativeLibrary.isRunning() && !NativeLibrary.isPaused()) {
+            if (!DirectoryInitialization.areDirectoriesReady) {
+                DirectoryInitialization.start()
+            }
+
+            updateScreenLayout()
+
+            emulationState.run(emulationActivity!!.isActivityRecreated, programIndex)
+        }
+    }
+
    override fun onConfigurationChanged(newConfig: Configuration) {
        super.onConfigurationChanged(newConfig)
        val b = _binding ?: return
@@ -1396,9 +1375,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        super.onDestroyView()
        amiiboLoadJob?.cancel()
        amiiboLoadJob = null
-        perfStatsRunnable?.let { perfStatsUpdateHandler.removeCallbacks(it) }
-        socRunnable?.let { socUpdateHandler.removeCallbacks(it) }
-        handler.removeCallbacksAndMessages(null)
        clearPausedFrame()
        _binding?.surfaceInputOverlay?.touchEventListener = null
        _binding = null
@@ -1406,9 +1382,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    }

    override fun onDetach() {
-        if (!hasNewerEmulationFragment()) {
-            NativeLibrary.clearEmulationActivity()
-        }
+        NativeLibrary.clearEmulationActivity()
        super.onDetach()
    }

@@ -1866,74 +1840,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    }

    override fun surfaceDestroyed(holder: SurfaceHolder) {
-        if (this::emulationState.isInitialized && !hasNewerEmulationFragment()) {
-            emulationState.clearSurface()
-        }
+        emulationState.clearSurface()
        emulationStarted = false
    }

-    private fun hasNewerEmulationFragment(): Boolean {
-        val activity = emulationActivity ?: return false
-        return try {
-            val navHostFragment =
-                activity.supportFragmentManager.findFragmentById(R.id.fragment_container) as? NavHostFragment
-                    ?: return false
-            val currentFragment = navHostFragment.childFragmentManager.fragments
-                .filterIsInstance<EmulationFragment>()
-                .firstOrNull()
-            currentFragment != null && currentFragment !== this
-        } catch (_: Exception) {
-            false
-        }
-    }
-
-    // xbzk: called from EmulationActivity when a new game is loaded while this fragment is still active,
-    // to wait for the emulation thread to stop before allowing the ROM swap to proceed
-    fun notifyWhenEmulationThreadStops(onStopped: () -> Unit) {
-        if (!this::emulationState.isInitialized) {
-            onStopped()
-            return
-        }
-        val emuThread = runCatching { emulationState.emulationThread }.getOrNull()
-        if (emuThread == null || !emuThread.isAlive) {
-            onStopped()
-            return
-        }
-        Thread({
-            runCatching { emuThread.join() }
-            Handler(Looper.getMainLooper()).post {
-                onStopped()
-            }
-        }, "RomSwapWait").start()
-    }
-
-    // xbzk: called from EmulationActivity when a new game is loaded while this
-    // fragment is still active, to stop the current emulation before swapping the ROM
-    fun stopForRomSwap() {
-        if (isStoppingForRomSwap) {
-            return
-        }
-        isStoppingForRomSwap = true
-        clearPausedFrame()
-        emulationViewModel.setIsEmulationStopping(true)
-        _binding?.let {
-            binding.loadingText.setText(R.string.shutting_down)
-            ViewUtils.showView(binding.loadingIndicator)
-            ViewUtils.hideView(binding.inputContainer)
-            ViewUtils.hideView(binding.showStatsOverlayText)
-        }
-        if (this::emulationState.isInitialized) {
-            emulationState.stop()
-            if (NativeLibrary.isRunning() || NativeLibrary.isPaused()) {
-                Log.warning("[EmulationFragment] ROM swap stop fallback: forcing native stop request.")
-                NativeLibrary.stopEmulation()
-            }
-        } else {
-            NativeLibrary.stopEmulation()
-        }
-        NativeConfig.reloadGlobalConfig()
-    }
-
    private fun showOverlayOptions() {
        val anchor = binding.inGameMenu.findViewById<View>(R.id.menu_overlay_controls)
        val popup = PopupMenu(requireContext(), anchor)
@@ -2224,7 +2134,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                state = State.STOPPED
            } else {
                Log.warning("[EmulationFragment] Stop called while already stopped.")
-                NativeLibrary.stopEmulation()
            }
        }

@@ -36,7 +36,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentGamePropertiesBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen
-import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.GameProperty
 import org.yuzu.yuzu_emu.model.GamesViewModel
@@ -47,7 +46,6 @@ import org.yuzu.yuzu_emu.model.SubmenuProperty
 import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
-import org.yuzu.yuzu_emu.utils.GameHelper
 import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.MemoryUtil
@@ -63,7 +61,6 @@ class GamePropertiesFragment : Fragment() {

    private val homeViewModel: HomeViewModel by activityViewModels()
    private val gamesViewModel: GamesViewModel by activityViewModels()
-    private val addonViewModel: AddonViewModel by activityViewModels()
    private val driverViewModel: DriverViewModel by activityViewModels()

    private val args by navArgs<GamePropertiesFragmentArgs>()
@@ -121,20 +118,6 @@ class GamePropertiesFragment : Fragment() {
                .show(childFragmentManager, LaunchGameDialogFragment.TAG)
        }

-        if (GameHelper.cachedGameList.isEmpty()) {
-            binding.buttonStart.isEnabled = false
-            viewLifecycleOwner.lifecycleScope.launch {
-                withContext(Dispatchers.IO) {
-                    GameHelper.restoreContentForGame(args.game)
-                }
-                if (_binding == null) {
-                    return@launch
-                }
-                addonViewModel.onAddonsViewStarted(args.game)
-                binding.buttonStart.isEnabled = true
-            }
-        }
-
        reloadList()

        homeViewModel.openImportSaves.collect(
@@ -150,11 +133,8 @@ class GamePropertiesFragment : Fragment() {
    }

    override fun onDestroy() {
-        val isChangingConfigurations = activity?.isChangingConfigurations == true
        super.onDestroy()
-        if (!isChangingConfigurations) {
-            gamesViewModel.reloadGames(true)
-        }
+        gamesViewModel.reloadGames(true)
    }

    private fun getPlayTime() {
@@ -154,30 +154,15 @@ class DriverViewModel : ViewModel() {
    }

    fun onDriverRemoved(removedPosition: Int, selectedPosition: Int) {
-        val driverIndex = removedPosition - 1
-        if (driverIndex !in driverData.indices) {
-            updateDriverList()
-            return
-        }
-
-        driversToDelete.add(driverData[driverIndex].first)
-        driverData.removeAt(driverIndex)
-        val safeSelectedPosition = selectedPosition.coerceIn(0, driverData.size)
-        onDriverSelected(safeSelectedPosition)
+        driversToDelete.add(driverData[removedPosition - 1].first)
+        driverData.removeAt(removedPosition - 1)
+        onDriverSelected(selectedPosition)
    }

    fun onDriverAdded(driver: Pair<String, GpuDriverMetadata>) {
        if (driversToDelete.contains(driver.first)) {
            driversToDelete.remove(driver.first)
        }
-
-        val existingDriverIndex = driverData.indexOfFirst {
-            it.first == driver.first || it.second == driver.second
-        }
-        if (existingDriverIndex != -1) {
-            onDriverSelected(existingDriverIndex + 1)
-            return
-        }
        driverData.add(driver)
        onDriverSelected(driverData.size)
    }
@@ -100,45 +100,42 @@ class GamesViewModel : ViewModel() {

        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                try {
-                    if (firstStartup) {
-                        // Retrieve list of cached games
-                        val storedGames =
-                            PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
-                                .getStringSet(GameHelper.KEY_GAMES, emptySet())
-                        if (storedGames!!.isNotEmpty()) {
-                            val deserializedGames = mutableSetOf<Game>()
-                            storedGames.forEach {
-                                val game: Game
-                                try {
-                                    game = Json.decodeFromString(it)
-                                } catch (e: Exception) {
-                                    // We don't care about any errors related to parsing the game cache
-                                    return@forEach
-                                }
-
-                                val gameExists =
-                                    DocumentFile.fromSingleUri(
-                                        YuzuApplication.appContext,
-                                        Uri.parse(game.path)
-                                    )?.exists()
-                                if (gameExists == true) {
-                                    deserializedGames.add(game)
-                                }
+                if (firstStartup) {
+                    // Retrieve list of cached games
+                    val storedGames =
+                        PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
+                            .getStringSet(GameHelper.KEY_GAMES, emptySet())
+                    if (storedGames!!.isNotEmpty()) {
+                        val deserializedGames = mutableSetOf<Game>()
+                        storedGames.forEach {
+                            val game: Game
+                            try {
+                                game = Json.decodeFromString(it)
+                            } catch (e: Exception) {
+                                // We don't care about any errors related to parsing the game cache
+                                return@forEach
+                            }
+
+                            val gameExists =
+                                DocumentFile.fromSingleUri(
+                                    YuzuApplication.appContext,
+                                    Uri.parse(game.path)
+                                )?.exists()
+                            if (gameExists == true) {
+                                deserializedGames.add(game)
                            }
-                            setGames(deserializedGames.toList())
                        }
+                        setGames(deserializedGames.toList())
                    }
+                }

-                    setGames(GameHelper.getGames())
-                    _shouldScrollAfterReload.value = true
+                setGames(GameHelper.getGames())
+                reloading.set(false)
+                _isReloading.value = false
+                _shouldScrollAfterReload.value = true

-                    if (directoriesChanged) {
-                        setShouldSwapData(true)
-                    }
-                } finally {
-                    reloading.set(false)
-                    _isReloading.value = false
+                if (directoriesChanged) {
+                    setShouldSwapData(true)
                }
            }
        }
@@ -23,8 +23,8 @@ object DirectoryInitialization {
    fun start() {
        if (!areDirectoriesReady) {
            initializeInternalStorage()
-            NativeConfig.initializeGlobalConfig()
            NativeLibrary.initializeSystem(false)
+            NativeConfig.initializeGlobalConfig()
            NativeLibrary.reloadProfiles()
            migrateSettings()
            areDirectoriesReady = true
@@ -8,11 +8,9 @@ package org.yuzu.yuzu_emu.utils

 import android.content.SharedPreferences
 import android.net.Uri
-import android.provider.DocumentsContract
 import androidx.preference.PreferenceManager
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.io.File
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.Game
@@ -51,8 +49,29 @@ object GameHelper {
        // Remove previous filesystem provider information so we can get up to date version info
        NativeLibrary.clearFilesystemProvider()

+        // Scan External Content directories and register all NSP/XCI files
+        val externalContentDirs = NativeConfig.getExternalContentDirs()
+        val uniqueExternalContentDirs = linkedSetOf<String>()
+        externalContentDirs.forEach { externalDir ->
+            if (externalDir.isNotEmpty()) {
+                uniqueExternalContentDirs.add(externalDir)
+            }
+        }
+
        val mountedContainerUris = mutableSetOf<String>()
-        mountExternalContentDirectories(mountedContainerUris)
+        for (externalDir in uniqueExternalContentDirs) {
+            if (externalDir.isNotEmpty()) {
+                val externalDirUri = externalDir.toUri()
+                if (FileUtil.isTreeUriValid(externalDirUri)) {
+                    scanContentContainersRecursive(FileUtil.listFiles(externalDirUri), 3) {
+                        val containerUri = it.uri.toString()
+                        if (mountedContainerUris.add(containerUri)) {
+                            NativeLibrary.addFileToFilesystemProvider(containerUri)
+                        }
+                    }
+                }
+            }
+        }

        val badDirs = mutableListOf<Int>()
        gameDirs.forEachIndexed { index: Int, gameDir: GameDir ->
@@ -96,15 +115,6 @@ object GameHelper {
        return games.toList()
    }

-    fun restoreContentForGame(game: Game) {
-        NativeLibrary.reloadKeys()
-
-        val mountedContainerUris = mutableSetOf<String>()
-        mountExternalContentDirectories(mountedContainerUris)
-        mountGameFolderContent(Uri.parse(game.path), mountedContainerUris)
-        NativeLibrary.addFileToFilesystemProvider(game.path)
-    }
-
    // File extensions considered as external content, buuut should
    // be done better imo.
    private val externalContentExtensions = setOf("nsp", "xci")
@@ -171,71 +181,6 @@ object GameHelper {
        }
    }

-    private fun mountExternalContentDirectories(mountedContainerUris: MutableSet<String>) {
-        val uniqueExternalContentDirs = linkedSetOf<String>()
-        NativeConfig.getExternalContentDirs().forEach { externalDir ->
-            if (externalDir.isNotEmpty()) {
-                uniqueExternalContentDirs.add(externalDir)
-            }
-        }
-
-        for (externalDir in uniqueExternalContentDirs) {
-            val externalDirUri = externalDir.toUri()
-            if (FileUtil.isTreeUriValid(externalDirUri)) {
-                scanContentContainersRecursive(FileUtil.listFiles(externalDirUri), 3) {
-                    val containerUri = it.uri.toString()
-                    if (mountedContainerUris.add(containerUri)) {
-                        NativeLibrary.addFileToFilesystemProvider(containerUri)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun mountGameFolderContent(gameUri: Uri, mountedContainerUris: MutableSet<String>) {
-        if (gameUri.scheme == "content") {
-            val parentUri = getParentDocumentUri(gameUri) ?: return
-            scanContentContainersRecursive(FileUtil.listFiles(parentUri), 1) {
-                val containerUri = it.uri.toString()
-                if (mountedContainerUris.add(containerUri)) {
-                    NativeLibrary.addGameFolderFileToFilesystemProvider(containerUri)
-                }
-            }
-            return
-        }
-
-        val gameFile = File(gameUri.path ?: gameUri.toString())
-        val parentDir = gameFile.parentFile ?: return
-        parentDir.listFiles()?.forEach { sibling ->
-            if (!sibling.isFile) {
-                return@forEach
-            }
-
-            val extension = sibling.extension.lowercase()
-            if (externalContentExtensions.contains(extension)) {
-                val containerUri = Uri.fromFile(sibling).toString()
-                if (mountedContainerUris.add(containerUri)) {
-                    NativeLibrary.addGameFolderFileToFilesystemProvider(containerUri)
-                }
-            }
-        }
-    }
-
-    private fun getParentDocumentUri(uri: Uri): Uri? {
-        return try {
-            val documentId = DocumentsContract.getDocumentId(uri)
-            val separatorIndex = documentId.lastIndexOf('/')
-            if (separatorIndex == -1) {
-                null
-            } else {
-                val parentDocumentId = documentId.substring(0, separatorIndex)
-                DocumentsContract.buildDocumentUriUsingTree(uri, parentDocumentId)
-            }
-        } catch (_: Exception) {
-            null
-        }
-    }
-
    fun getGame(
        uri: Uri,
        addedToLibrary: Boolean,
@@ -473,6 +473,8 @@
    <string name="renderer_accuracy_description">يتحكم في وضع محاكاة وحدة معالجة الرسومات. تعمل معظم الألعاب بشكل جيد مع وضعي سريع أو متوازن، لكن الوضع الدقيق لا يزال مطلوبًا لبعض الألعاب. تميل الجسيمات إلى العرض بشكل صحيح فقط عند استخدام الوضع الدقيق.</string>
    <string name="dma_accuracy">دقة DMA</string>
    <string name="dma_accuracy_description">يتحكم في دقة DMA. يمكن أن تؤدي الدقة الآمنة إلى حل المشكلات في بعض الألعاب، ولكنها قد تؤثر أيضًا على الأداء في بعض الحالات. إذا لم تكن متأكدًا، فاترك هذا الخيار على الإعداد الافتراضي.</string>
+    <string name="frame_pacing_mode">وضع توقيت الإطارات</string>
+    <string name="frame_pacing_mode_description">يتحكم في كيفية إدارة المحاكي لسرعة الإطارات لتقليل التقطع وجعل معدل الإطارات أكثر سلاسة واتساقًا.</string>
    <string name="anisotropic_filtering">تصفية متباينة الخواص</string>
    <string name="anisotropic_filtering_description">يحسن جودة الأنسجة عند عرضها بزوايا مائلة</string>
    <string name="vram_usage_mode">وضع استخدام ذاكرة VRAM</string>
@@ -997,6 +999,13 @@
    <string name="dma_accuracy_unsafe">غير آمن</string>
    <string name="dma_accuracy_safe">آمن</string>

+    <!-- Frame Pacing Mode -->
+    <string name="frame_pacing_mode_target_Auto">تلقائي</string>
+    <string name="frame_pacing_mode_target_30">30 إطارًا في الثانية</string>
+    <string name="frame_pacing_mode_target_60">60 إطارًا في الثانية</string>
+    <string name="frame_pacing_mode_target_90">90 إطارًا في الثانية</string>
+    <string name="frame_pacing_mode_target_120">120 إطارًا في الثانية</string>
+
    <!-- ASTC Recompression Method Choices -->
    <string name="astc_recompression_uncompressed">غير مضغوط</string>
    <!-- ASTC Recompression Method Choices -->
@@ -1066,8 +1075,6 @@
    <string name="theme_material_you">ألوان ديناميكية</string>
    <string name="app_settings">إعدادات التطبيق</string>
    <string name="theme_and_color">السمة واللون</string>
-    <string name="fullscreen_mode">وضع ملء الشاشة</string>
-    <string name="fullscreen_mode_description">إخفاء أشرطة نظام Android عبر شاشات التطبيق. اسحب من أحد الحواف لإظهارها مؤقتًا.</string>

    <!-- Theme Modes -->
    <string name="change_theme_mode">تغيير وضع السمة</string>
@@ -1098,7 +1105,7 @@
    <string name="blue">أزرق</string>
    <string name="cyan">سماوي</string>
    <string name="red">أحمر</string>
-    <string name="green">أخضر</string>
+    <string name="green">أخضر (افتراضي)</string>
    <string name="yellow">أصفر</string>
    <string name="orange">برتقالي</string>
    <string name="pink">وردي</string>
@@ -452,6 +452,8 @@
    <string name="renderer_accuracy_description">Určuje režim emulovaného GPU. Většina her běží bez problémů v rychlém, nebo vyváženém režimu, ale některé stále vyžadují přesný režim. Částicové efekty se většinou zobrazují korektně pouze v přesném režimu. </string>
    <string name="dma_accuracy">Přesnost DMA</string>
    <string name="dma_accuracy_description">Ovládá přesnost DMA. Bezpečná přesnost může vyřešit problémy v některých hrách, ale v některých případech může také ovlivnit výkon. Pokud si nejste jisti, použijte výchozí nastavení.</string>
+    <string name="frame_pacing_mode">Režim Framepacingu</string>
+    <string name="frame_pacing_mode_description">Řídí způsob jakým emulátor spravuje časování snímku aby  snížil trhání a zlepšení plynulost a stabilitu snímkové frekvence.</string>
    <string name="anisotropic_filtering">Anizotropní filtrování</string>
    <string name="anisotropic_filtering_description">Zlepšuje kvalitu textur při pohledu pod úhlem</string>
    <string name="vram_usage_mode">Režim využití VRAM</string>
@@ -1004,6 +1004,7 @@ Wirklich fortfahren?</string>
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">App-Einstellungen</string>
    <string name="theme_and_color">Theme und Farben</string>
+
    <!-- Theme Modes -->
    <string name="change_theme_mode">Design</string>
    <string name="theme_mode_follow_system">System folgen</string>
@@ -302,7 +302,7 @@
    <string name="manage_save_data">Administrar datos de guardado</string>
    <string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
    <string name="import_save_warning">Importar datos de guardado</string>
-    <string name="import_save_warning_description">Esto sobreescribirá todos los datos de guardado existentes con el archivo proporcionado. ¿Está seguro de querer continuar\?</string>
+    <string name="import_save_warning_description">Ésto sobreescribirá todos los datos de guardado existentes con el archivo proporcionado. ¿Está seguro de querer continuar?</string>
    <string name="save_files_importing">Importando archivos de guardado...</string>
    <string name="save_files_exporting">Exportando archivos de guardado...</string>
    <string name="save_file_imported_success">Importado correctamente</string>
@@ -333,8 +333,8 @@
    <string name="install_game_content_help_link">https://yuzu-mirror.github.io/help/quickstart/#dumping-installed-updates</string>
    <string name="custom_driver_not_supported">Controladores personalizados no soportados</string>
    <string name="custom_driver_not_supported_description">La carga de controladores personalizados no está disponible para este dispositivo.\n¡Compruebe más adelante si se añadió el soporte a esta opción!</string>
-    <string name="manage_yuzu_data">Gestionar datos de Eden</string>
-    <string name="manage_yuzu_data_description">Importar/exportar el firmware, las claves, los datos de usuario, ¡y más!</string>
+    <string name="manage_yuzu_data">Administrar datos de Eden</string>
+    <string name="manage_yuzu_data_description">Importa/exporta el firmware, las claves, los datos de usuario, ¡y más!</string>
    <string name="game_folders">Carpetas de juegos</string>
    <string name="deep_scan">Escaneo recursivo </string>
    <string name="add_game_folder">Añadir carpeta con juegos</string>
@@ -350,8 +350,8 @@
        <item quantity="many">%d archivos de guardado importados con éxito.</item>
        <item quantity="other">%d archivos de guardado importados con éxito.</item>
    </plurals>
-    <string name="no_save_data_found">No se encontraron datos de guardado</string>
-    <string name="verify_installed_content">Verificar contenido instalado</string>
+    <string name="no_save_data_found">No hay archivos de guardado</string>
+    <string name="verify_installed_content">Verificar contenidos instalados</string>
    <string name="verify_installed_content_description">Comprueba todo el contenido instalado por si hubiese alguno corrupto</string>

    <string name="keys_missing">Faltan las claves de encriptación</string>
@@ -467,6 +467,8 @@
    <string name="renderer_accuracy_description">Controla el modo de la emulación de la GPU. La mayoría de los juegos se renderizan correctamente en los modos Rápido o Equilibrado, pero algunos requieren Preciso. Las partículas tienden a renderizarse correctamente solo con el modo Preciso.</string>
    <string name="dma_accuracy">Precisión de DMA</string>
    <string name="dma_accuracy_description">Controla la precisión de DMA. La precisión segura puede solucionar problemas en algunos juegos, pero también puede afectar al rendimiento en algunos casos. Si no está seguro, déjelo en Predeterminado.</string>
+    <string name="frame_pacing_mode">Modo de ritmo de fotogramas</string>
+    <string name="frame_pacing_mode_description">Controla cómo el emulador gestiona el ritmo de los fotogramas para reducir los tirones y hacer que la velocidad de los fotogramas sea más suave y consistente.</string>
    <string name="anisotropic_filtering">Filtrado anisotrópico</string>
    <string name="anisotropic_filtering_description">Mejora la calidad de las texturas al ser observadas desde ángulos oblicuos</string>
    <string name="vram_usage_mode">Modo de uso de VRAM</string>
@@ -768,7 +770,7 @@
    <string name="developer">Desarrollador</string>
    <string name="version">Versión</string>
    <string name="copy_details">Copiar detalles</string>
-    <string name="add_ons">Complementos</string>
+    <string name="add_ons">Extras/Add-ons</string>
    <string name="add_ons_description">Activa/desactiva mods, actualizaciones y contenidos descargables</string>
    <string name="playtime">Tiempo jugado:</string>
    <string name="reset_playtime">Borrar tiempo de juego</string>
@@ -791,28 +793,28 @@
    <string name="cleared_shaders_successfully">Sombreadores limpiados con éxito</string>
    <string name="driver_shader_wipe_dialog_title">Sombreadores limpiados</string>
    <string name="driver_shader_wipe_dialog_message">Eden ha limpiado automáticamente todos los sombreadores guardados para mantener la canalización de Vulkan válida. Esto es esencial al cambiar o actualizar los controladores de la GPU para prevenir errores y fallos gráficos. Es posible que experimente algunas interrupciones durante la reconstrucción de los sombreadores.</string>
-    <string name="addons_game">Complementos: %1$s</string>
+    <string name="addons_game">Addons: %1$s</string>
    <string name="save_data">Datos de guardado</string>
-    <string name="save_data_description">Gestiona los datos de guardado de este juego</string>
+    <string name="save_data_description">Controla los datos de guardado de este juego</string>
    <string name="delete_save_data">Borrar datos de guardado</string>
-    <string name="delete_save_data_description">Elimina todos los datos de guardado especificos de este juego</string>
-    <string name="delete_save_data_warning_description">Esto eliminará de manera permanente todos los datos de guardado de este juego. ¿Está seguro de que quiere continuar\?</string>
+    <string name="delete_save_data_description">Elimina todos los datos de guardado de este juego</string>
+    <string name="delete_save_data_warning_description">Ésto elimina de manera permanente todos los datos de guardado de este juego. ¿Seguro que quieres continuar?</string>
    <string name="save_data_deleted_successfully">Datos de guardado eliminados con éxito</string>
    <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 de complementos</string>
+    <string name="addon_notice">Aviso importante de addons</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>
    <!-- \"cheats/" "romfs/" and \"exefs/ should not be translated -->
    <string name="invalid_directory_description">Por favor, asegúrese de que el directorio que ha selecionado incluye las carpetas cheats/, romfs/, o exefs/ e inténtelo de nuevo.</string>
-    <string name="addon_installed_successfully">Complemento instalado con éxito</string>
+    <string name="addon_installed_successfully">Addon instalado con éxito</string>
    <string name="verifying_content">Verificando contenido...</string>
    <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á seguro de que quiere desinstalar este complemento\?</string>
+    <string name="confirm_uninstall_description">¿De verdad quieres desinstalar este addon?</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>
@@ -828,14 +830,14 @@

    <!-- ROM loading errors -->
    <string name="loader_error_encrypted">Su ROM está encriptada</string>
-    <string name="loader_error_encrypted_roms_description"><![CDATA[Siga las guías para volver a volcar sus <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-physical-titles-game-cards\">tarjetas de juego</a> o <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-digital-titles-eshop\">títulos instalados</a>.]]></string>
-    <string name="loader_error_encrypted_keys_description"><![CDATA[Por favor, compruebe que su archivo <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> está instalado, para que los juegos sean desencriptados.]]></string>
+    <string name="loader_error_encrypted_roms_description"><![CDATA[Siga las guías para volver a volcar sus <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-physical-titles-game-cards\">tarjetas de juego</a> o <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-digital-titles-eshop\">títulos digitales</a>.]]></string>
+    <string name="loader_error_encrypted_keys_description"><![CDATA[Por favor, compruebe que su archivo <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> está instalado, para que los juegos sean descifrados.]]></string>
    <string name="loader_error_video_core">Ocurrió un error al inicializar el núcleo de video, posiblemente debido a una incompatibilidad con el driver seleccionado</string>
    <string name="loader_error_video_core_description">Esto suele deberse a un controlador de la GPU incompatible. La instalación de un controlador de la GPU personalizado puede resolver este problema.</string>
    <string name="loader_error_file_not_found">Archivo ROM no existe</string>

    <string name="loader_requires_firmware">El juego requiere firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[El juego que intenta iniciar requiere el firmware para arrancar o pasar el menú de inicio. Por favor <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> vuelque e instale el firmware</a>, o pulse \"Aceptar\" para continuar de todos modos.]]></string>
+    <string name="loader_requires_firmware_description"><![CDATA[El juego que intentas iniciar requiere firmware para arrancar o pasar el menú de inicio. Por favor <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> vuelca e instala el firmware</a>, o pulsa \"Aceptar\" para continuar de todos modos.]]></string>

    <!-- Intent Launch strings -->
    <string name="searching_for_game">Buscando juego...</string>
@@ -991,6 +993,13 @@
    <string name="dma_accuracy_unsafe">Inseguro</string>
    <string name="dma_accuracy_safe">Seguro</string>

+    <!-- Frame Pacing Mode -->
+    <string name="frame_pacing_mode_target_Auto">Automático</string>
+    <string name="frame_pacing_mode_target_30">30 FPS</string>
+    <string name="frame_pacing_mode_target_60">60 FPS</string>
+    <string name="frame_pacing_mode_target_90">90 FPS</string>
+    <string name="frame_pacing_mode_target_120">120 FPS</string>
+
    <!-- ASTC Recompression Method Choices -->
    <string name="astc_recompression_uncompressed">Sin compresión</string>
    <!-- ASTC Recompression Method Choices -->
@@ -1060,8 +1069,6 @@
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">Configuración de la aplicación</string>
    <string name="theme_and_color">Tema y color</string>
-    <string name="fullscreen_mode">Modo pantalla completa</string>
-    <string name="fullscreen_mode_description">Ocultar las barras del sistema de Android. Desliza la pantalla desde una esquina para mostrarlas temporalmente.</string>

    <!-- Theme Modes -->
    <string name="change_theme_mode">Cambiar modo del tema</string>
@@ -1092,7 +1099,7 @@
    <string name="blue">Azul</string>
    <string name="cyan">Cian</string>
    <string name="red">Rojo</string>
-    <string name="green">Verde</string>
+    <string name="green">Verde (Predeterminado)</string>
    <string name="yellow">Amarillo</string>
    <string name="orange">Naranja</string>
    <string name="pink">Rosa</string>
@@ -1121,7 +1128,7 @@
    <string name="airplane_mode">Modo avión</string>
    <string name="airplane_mode_description">Pasa el modo avión al sistema operativo Switch</string>

-    <string name="enable_overlay">Habilitar el applet de superposición</string>
+    <string name="enable_overlay">Habilitar el Applet de superposición</string>
    <string name="enable_overlay_description">Activa el applet integrado superpuesto de Horizon. Mantenga pulsado el botón de inicio durante 1 segundo para que aparezca.</string>

    <!-- Profile Management -->
@@ -275,11 +275,8 @@
    <string name="cpu_info">Informations sur le processeur central</string>
    <string name="gpu_information">Informations sur le processeur graphique</string>
    <string name="vulkan_driver_version">Version du pilote Vulkan</string>
-    <string name="error_getting_emulator_info">Impossible d’obtenir les infos de l’émulateur</string>
    <string name="memory_info">Informations sur la mémoire</string>
    <string name="total_memory">Capacité totale de mémoire</string>
-    <string name="soc">SOC:</string>
-
    <string name="warning_help">Aide</string>
    <string name="warning">Avertissement</string>
    <string name="warning_skip">Sauter</string>
@@ -317,9 +314,6 @@
    <string name="share_log">Partager les logs de débogage</string>
    <string name="share_log_description">Partagez le fichier de log de Eden pour déboguer les problèmes.</string>
    <string name="share_log_missing">Aucun fichier de log trouvé</string>
-    <string name="share_gpu_log">Partager les logs du GPU</string>
-    <string name="share_gpu_log_description">Partage les logs du GPU générés par Eden afin de déboguer les problèmes graphiques.</string>
-    <string name="share_gpu_log_missing">Aucun fichier de log du GPU trouvé,</string>
    <string name="install_game_content">Installer le contenu du jeu</string>
    <string name="install_game_content_description">Installer une mise à jour ou un DLC</string>
    <string name="installing_game_content">Installation du contenu en cours...</string>
@@ -375,9 +369,7 @@
    <string name="qlaunch_description">Lancer des applications depuis l\'écran d\'accueil du système</string>
    <string name="applets">Lanceur d\'applets</string>
    <string name="applets_description">Lancer des applets système en utilisant le firmware installé</string>
-    <string name="applets_error_firmware">Aucun firmware installé</string>
    <string name="applets_error_applet">Applet non disponible</string>
-    <string name="applets_error_description"><![CDATA[Veuillez vérifier que votre fichier<a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> et le<a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-system-firmware\">firmware</a>sont installés et réessayez.]]></string>
    <string name="album_applet">Album</string>
    <string name="album_applet_description">Afficher les images stockées dans le dossier de captures d\'écran de l\'utilisateur avec le visualiseur de photos système.</string>
    <string name="mii_edit_applet">Éditeur Mii</string>
@@ -395,7 +387,6 @@
    <string name="copied_to_clipboard">Copié dans le presse-papier</string>
    <string name="about_app_description">Un émulateur Switch open source</string>
    <string name="contributors">Contributeurs</string>
-    <string name="contributors_description">Les gens qui ont rendu possible Eden pour Android</string>
    <string name="licenses_description">Des projets qui rendent possible Eden pour Android</string>
    <string name="build">Build</string>
    <string name="user_data">Données utilisateur</string>
@@ -412,8 +403,6 @@
    <string name="frame_limit_enable_description">Limiter la vitesse d\'émulation à un pourcentage spécifié de la vitesse normale</string>
    <string name="frame_limit_slider">Limiter le pourcentage de vitesse</string>
    <string name="frame_limit_slider_description">Spécifier le pourcentage pour limiter la vitesse d\'émulation. 100% correspond à la vitesse normale. Des valeurs plus élevées ou plus basses augmenteront ou diminueront la limite de vitesse.</string>
-    <string name="turbo_speed_limit">Vitesse turbo</string>
-    <string name="slow_speed_limit">Vitesse lente</string>
    <string name="cpu_backend">Backend du CPU</string>
    <string name="cpu_accuracy">Précision du CPU</string>
    <string name="value_with_units">%1$s%2$s</string>
@@ -430,9 +419,6 @@
    <string name="use_custom_rtc_description">Vous permet de définir une horloge en temps réel personnalisée distincte de l\'heure actuelle de votre système.</string>
    <string name="set_custom_rtc">Définir l\'horloge RTC personnalisée</string>

-    <!-- CPU -->
-    <string name="fast_cpu_time">Overclock du CPU</string>
-    <string name="fast_cpu_time_description">Force le CPU émulé à fonctionner à une fréquence plus élevée, en contournant certaines limitations de FPS. Utilisez Boost (1700 MHz) pour atteindre la fréquence native maximale de la Nintendo Switch, ou Fast (2000 MHz) pour doubler la fréquence. C’est un “hack”. Certains chipsets moins puissants peuvent voir leurs performances réduites et les jeux peuvent se comporter différemment.</string>
    <string name="custom_cpu_ticks">Ticks CPU personnalisés</string>
    <string name="custom_cpu_ticks_description">Définissez une valeur personnalisée de ticks CPU. Des valeurs plus élevées peuvent améliorer les performances, mais peuvent aussi provoquer des gels du jeu. Une plage de 77 à 21000 est recommandée.</string>
    <string name="cpu_ticks">Ticks</string>
@@ -911,6 +897,7 @@
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">Paramètres de l’App</string>
    <string name="theme_and_color">Thème et Couleur</string>
+
    <!-- Theme Modes -->
    <string name="change_theme_mode">Changer le mode de thème</string>
    <string name="theme_mode_follow_system">Automatique</string>
@@ -844,6 +844,7 @@
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">Impostazioni app</string>
    <string name="theme_and_color">Tema e colore</string>
+
    <!-- Theme Modes -->
    <string name="change_theme_mode">Cambia la modalità del tema</string>
    <string name="theme_mode_follow_system">Segue il Sistema</string>
@@ -960,6 +960,7 @@
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">Ustawienia aplikacji</string>
    <string name="theme_and_color">Motyw i kolor</string>
+
    <!-- Theme Modes -->
    <string name="change_theme_mode">Zmień tryb motywu</string>
    <string name="theme_mode_follow_system">Podążaj za systemowym</string>
@@ -905,6 +905,7 @@
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">Configurações do App</string>
    <string name="theme_and_color">Tema e Cores</string>
+
    <!-- Theme Modes -->
    <string name="change_theme_mode">Alterar o tema</string>
    <string name="theme_mode_follow_system">Igual ao Sistema</string>
@@ -352,7 +352,7 @@
        <item quantity="many">Импортировано %d сохранений</item>
        <item quantity="other">Импортировано %d сохранений</item>
    </plurals>
-    <string name="no_save_data_found">Файлы сохранений не найдены</string>
+    <string name="no_save_data_found">Не найдены сохраненмия</string>
    <string name="verify_installed_content">Подтвердить установленный контент</string>
    <string name="verify_installed_content_description">Проверяет весь установленный контент на наличие повреждений</string>

@@ -361,7 +361,7 @@
    <string name="keys_missing_help">https://yuzu-mirror.github.io/help/quickstart/#dumping-decryption-keys</string>

    <string name="uninstall_firmware">Удалить прошивку</string>
-    <string name="uninstall_firmware_description">Удаление прошивки сотрёт её с устройства и может повлиять на совместимость игр.</string>
+    <string name="uninstall_firmware_description">Удаление прошивки сотрет ее с устройства и может повлиять на совместимость игр.</string>
    <string name="firmware_uninstalling">Удаление прошивки...</string>
    <string name="firmware_uninstalled_success">Прошивка успешно удалена</string>

@@ -397,7 +397,6 @@
    <string name="copied_to_clipboard">Скопировано в буфер обмена</string>
    <string name="about_app_description">Эмулятор Switch с открытым исходным кодом</string>
    <string name="contributors">Контрибьюторы</string>
-    <string name="contributors_description">Люди, благодаря которым появился Eden для Android</string>
    <string name="licenses_description">Проекты, которые сделали Eden для Android возможным</string>
    <string name="build">Сборка</string>
    <string name="user_data">Данные пользователя</string>
@@ -469,6 +468,8 @@
    <string name="renderer_accuracy_description">Управляет режимом эмуляции графического процессора. Большинство игр нормально отображаются в режимах «Быстрый» или «Сбалансированный», но для некоторых требуется режим «Точный». Частицы обычно корректно отображаются только в режиме «Точный».</string>
    <string name="dma_accuracy">Точность DMA</string>
    <string name="dma_accuracy_description">Управляет точностью DMA. Безопасная точность может исправить проблемы в некоторых играх, но в некоторых случаях также может повлиять на производительность. Если не уверены, оставьте значение По умолчанию.</string>
+    <string name="frame_pacing_mode">Режим синхронизации кадров</string>
+    <string name="frame_pacing_mode_description">Управляет синхронизацией кадров в эмуляторе для уменьшения рывков и обеспечения более плавной и стабильной частоты кадров.</string>
    <string name="anisotropic_filtering">Анизотропная фильтрация</string>
    <string name="anisotropic_filtering_description">Улучшает качество текстур под углом</string>
    <string name="vram_usage_mode">Режим VRAM</string>
@@ -482,7 +483,7 @@
    <string name="sync_memory_operations_description">Обеспечивает согласованность данных между вычислительными операциями и операциями с памятью. Эта опция должна исправлять проблемы в некоторых играх, но может снижать производительность в некоторых случаях. Наиболее сильно это затрагивает игры на Unreal Engine 4.</string>
    <string name="use_disk_shader_cache">Кэш шейдеров на диске</string>
    <string name="use_disk_shader_cache_description">Уменьшение зависаний за счет хранения и загрузки сгенерированных шейдеров.</string>
-    <string name="renderer_force_max_clock">Принудительная максимальная тактовая частота (только для Adreno)</string>
+    <string name="renderer_force_max_clock">Принудительно заставить максимальную тактовую частоту (только для Adreno)</string>
    <string name="renderer_force_max_clock_description">Заставляет ГПУ работать на максимально возможных тактовых частотах (тепловые ограничения все равно будут применяться).</string>
    <string name="renderer_reactive_flushing">Реактивная очистка</string>
    <string name="renderer_reactive_flushing_description">Повышение точности рендеринга в некоторых играх за счет снижения производительности.</string>
@@ -993,6 +994,13 @@
    <string name="dma_accuracy_unsafe">Небезопасно</string>
    <string name="dma_accuracy_safe">Безопасный</string>

+    <!-- Frame Pacing Mode -->
+    <string name="frame_pacing_mode_target_Auto">Авто</string>
+    <string name="frame_pacing_mode_target_30">30 FPS</string>
+    <string name="frame_pacing_mode_target_60">60 FPS</string>
+    <string name="frame_pacing_mode_target_90">90 FPS</string>
+    <string name="frame_pacing_mode_target_120">120 FPS</string>
+
    <!-- ASTC Recompression Method Choices -->
    <string name="astc_recompression_uncompressed">Без сжатия</string>
    <!-- ASTC Recompression Method Choices -->
@@ -1062,8 +1070,6 @@
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">Настройки приложения</string>
    <string name="theme_and_color">Тема и цвет</string>
-    <string name="fullscreen_mode">Полноэкранный режим</string>
-    <string name="fullscreen_mode_description">Скрывать системные панели Android на всех экранах приложения. Проведите от края экрана, чтобы временно отобразить их</string>

    <!-- Theme Modes -->
    <string name="change_theme_mode">Сменить режим темы</string>
@@ -1093,7 +1099,7 @@
    <string name="blue">Синий</string>
    <string name="cyan">Циановый</string>
    <string name="red">Красный</string>
-    <string name="green">Зелёный</string>
+    <string name="green">Зелёный (По умолчанию)</string>
    <string name="yellow">Жёлтый</string>
    <string name="orange">Оранжевый</string>
    <string name="pink">Розовый</string>
@@ -1119,8 +1125,8 @@

    <string name="swkbd_applet">Программная клавиатура</string>

-    <string name="airplane_mode">Режим полёта</string>
-    <string name="airplane_mode_description">Передаёт режим полёта в ОС Switch</string>
+    <string name="airplane_mode">Режим полета</string>
+    <string name="airplane_mode_description">Передает режим полета в ОС Switch</string>

    <string name="enable_overlay">Включить апплет-оверлей</string>
    <string name="enable_overlay_description">Активирует встроенный в Horizon оверлейный апплет. Для его отображения нажмите и удерживайте кнопку «HOME» в течение одной секунды.</string>
@@ -12,7 +12,7 @@
    <!-- Spinbox strings -->
    <string name="increment">Збільшення</string>
    <string name="decrement">Зменшення</string>
-    <string name="value_too_low">Значення повинно бути не менше %1$d</string>
+    <string name="value_too_low">Значення повинно бути щонайменше %1$d</string>
    <string name="value_too_high">Значення повинно бути не більше %1$d</string>
    <string name="invalid_value">Неправильне значення</string>

@@ -469,6 +469,8 @@
    <string name="renderer_accuracy_description">Керує режимом емуляції ГП. Більшість ігор добре візуалізуються з режимами «Швидко» або «Збалансовано», але деякі ігри можуть потребувати режиму «Точно». Частинки зазвичай правильно візуалізуються лише з режимом «Точно».</string>
    <string name="dma_accuracy">Точність DMA</string>
    <string name="dma_accuracy_description">Керує точністю DMA. Безпечна точність може виправити проблеми в деяких іграх, але в деяких випадках також може вплинути на продуктивність. Якщо не впевнені, залиште це значення за замовчуванням.</string>
+    <string name="frame_pacing_mode">Режим виведення кадрів</string>
+    <string name="frame_pacing_mode_description">Керує тим, як емулятор виконує виведення кадрів, щоб зменшити затримки й забезпечити плавнішу й стабільнішу частоту кадрів.</string>
    <string name="anisotropic_filtering">Анізотропне фільтрування</string>
    <string name="anisotropic_filtering_description">Покращує якість текстур під кутом.</string>
    <string name="vram_usage_mode">Режим використання VRAM</string>
@@ -993,6 +995,13 @@
    <string name="dma_accuracy_unsafe">Небезпечно</string>
    <string name="dma_accuracy_safe">Безпечно</string>

+    <!-- Frame Pacing Mode -->
+    <string name="frame_pacing_mode_target_Auto">Автоматично</string>
+    <string name="frame_pacing_mode_target_30">30 к/с</string>
+    <string name="frame_pacing_mode_target_60">60 к/с</string>
+    <string name="frame_pacing_mode_target_90">90 к/с</string>
+    <string name="frame_pacing_mode_target_120">120 к/с</string>
+
    <!-- ASTC Recompression Method Choices -->
    <string name="astc_recompression_uncompressed">Без стиснення</string>
    <!-- ASTC Recompression Method Choices -->
@@ -1062,8 +1071,6 @@
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">Налаштування застосунку</string>
    <string name="theme_and_color">Тема і колір</string>
-    <string name="fullscreen_mode">Повноекранний режим</string>
-    <string name="fullscreen_mode_description">Приховати системні панелі Android у застосунку. Проведіть пальцем від краю екрана, щоб показати їх на короткий час.</string>

    <!-- Theme Modes -->
    <string name="change_theme_mode">Змінити режим теми</string>
@@ -1094,7 +1101,7 @@
    <string name="blue">Синій</string>
    <string name="cyan">Блакитний</string>
    <string name="red">Червоний</string>
-    <string name="green">Зелений</string>
+    <string name="green">Зелений (стандартний)</string>
    <string name="yellow">Жовтий</string>
    <string name="orange">Помаранчевий</string>
    <string name="pink">Рожевий</string>
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

-    <string name="app_disclaimer">本软件可以运行Nintendo Switch游戏主机的游戏，但自身并不包含任何游戏或密钥。<br /><br />请于开始之前选定位于你的设备存储空间中的<![CDATA[<b>prod.keys</b>]]>。<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">了解更多</a>]]></string>
-    <string name="notice_notification_channel_name">错误与注意事项</string>
+    <string name="app_disclaimer">此软件可以运行Nintendo Switch游戏机的游戏，但本身并不自带任何游戏或密钥。<br /><br />开始之前，请先选择<![CDATA[<b>密钥文件（prod.keys）</b>]]>。<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">详情</a>]]></string>
+    <string name="notice_notification_channel_name">通知及错误提醒</string>
    <string name="notice_notification_channel_description">当发生错误时显示通知。</string>
    <string name="notification_permission_not_granted">未授予通知权限！</string>
    <string name="app_notification_channel_description">Eden模拟器通知</string>
@@ -12,36 +12,36 @@
    <!-- Spinbox strings -->
    <string name="increment">增加</string>
    <string name="decrement">减少</string>
-    <string name="value_too_low">此值至少应为  %1$d</string>
-    <string name="value_too_high">此值至多应为  %1$d</string>
+    <string name="value_too_low">值必须最小为  %1$d</string>
+    <string name="value_too_high">值最大必须为  %1$d</string>
    <string name="invalid_value">无效的值</string>

-    <string name="using_per_game_config">使用各别游戏配置</string>
+    <string name="using_per_game_config">使用针对特定游戏的配置</string>

    <!-- Input Overlay -->
-    <string name="show_input_overlay">显示输入叠加层</string>
-    <string name="show_input_overlay_description">在游戏模拟期间显示触控叠加层</string>
-    <string name="overlay_snap_to_grid">对齐到网格</string>
-    <string name="overlay_snap_to_grid_description">在编辑时将叠加层控件对齐到网格</string>
-    <string name="overlay_grid_size">网格尺寸</string>
-    <string name="overlay_grid_size_description">网格单元像素单位尺寸</string>
-    <string name="input_overlay_behavior">行为</string>
-    <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="invert_confirm_back_controller_buttons">切换“确认/返回”控制器按钮功能</string>
-    <string name="invert_confirm_back_controller_buttons_description">在与本应用的界面交互时，交换 Android 的“确认”与“返回”按钮的处理方式，以匹配 Switch 和 Xbox 的风格。</string>
+    <string name="show_input_overlay">虚拟按键输入</string>
+    <string name="show_input_overlay_description">在模拟过程中显示触摸控制覆盖</string>
+    <string name="overlay_snap_to_grid">截图到网格</string>
+    <string name="overlay_snap_to_grid_description">编辑时将叠加控件吸附到网格</string>
+    <string name="overlay_grid_size">网格大小</string>
+    <string name="overlay_grid_size_description">网格单元的大小（以像素为单位）</string>
+    <string name="input_overlay_behavior">平衡</string>
+    <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="invert_confirm_back_controller_buttons">反转 确认/返回 手柄按钮</string>
+    <string name="invert_confirm_back_controller_buttons_description">在使用应用界面时，将安卓确认和返回按钮的作切换到 Switch 和 Xbox 的样式。</string>

-    <string name="input_overlay_options">输入叠加层</string>
-    <string name="input_overlay_options_description">配置屏上控件</string>
-    <string name="edit_overlay_layout">编辑触控叠加层布局</string>
-    <string name="edit_overlay_layout_description">调整屏上控件的的位置和大小</string>
+    <string name="input_overlay_options">虚拟按键输入</string>
+    <string name="input_overlay_options_description">配置虚拟按键</string>
+    <string name="edit_overlay_layout">编辑虚拟按键</string>
+    <string name="edit_overlay_layout_description">调整屏幕控件的的位置和大小</string>


    <!-- Stats Overlay settings -->
-    <string name="process_ram">进程内存占用: %1$d MB</string>
+    <string name="process_ram">进程内存: %1$d MB</string>
    <string name="shaders_prefix">正在编译</string>
    <string name="shaders_suffix">着色器</string>
    <string name="charging">(充电中)</string>
@@ -51,31 +51,31 @@
    <string name="stats_overlay_customization">自定义</string>
    <string name="stats_overlay_items">显示项</string>
    <string name="stats_overlay_options">悬浮窗</string>
-    <string name="enable_stats_overlay_">启用性能统计叠加层</string>
-    <string name="stats_overlay_options_description">配置性能统计叠加层中显示的信息</string>
+    <string name="enable_stats_overlay_">启用性能统计悬浮窗</string>
+    <string name="stats_overlay_options_description">配置悬浮窗中显示的性能信息</string>
    <string name="show_fps">显示帧率</string>
-    <string name="show_fps_description">显示当前帧率</string>
+    <string name="show_fps_description">显示当前帧率(FPS)</string>
    <string name="show_frametime">显示帧时间</string>
-    <string name="show_app_ram_usage">显示应用内存使用情况</string>
-    <string name="show_app_ram_usage_description">显示模拟器内存用量</string>
-    <string name="show_system_ram_usage">显示系统内存使用情况</string>
-    <string name="show_system_ram_usage_description">显示系统内存用量</string>
+    <string name="show_app_ram_usage">显示应用内存占用</string>
+    <string name="show_app_ram_usage_description">显示模拟器正在使用的内存量</string>
+    <string name="show_system_ram_usage">显示系统内存占用</string>
+    <string name="show_system_ram_usage_description">显示系统使用的内存量</string>
    <string name="show_bat_temperature">显示电池温度</string>
    <string name="bat_temperature_unit">电池温度单位</string>
    <string name="show_power_info">显示电池信息</string>
    <string name="show_power_info_description">显示当前功耗和电池剩余容量</string>
-    <string name="show_shaders_building">显示着色器编译信息</string>
-    <string name="show_shaders_building_description">显示当前正在编译的着色器数量</string>
-    <string name="overlay_position">叠加层位置</string>
-    <string name="overlay_position_description">选择叠加层在屏幕上显示的位置</string>
+    <string name="show_shaders_building">显示着色器构建</string>
+    <string name="show_shaders_building_description">显示当前正在构建的着色器数量</string>
+    <string name="overlay_position">悬浮窗位置</string>
+    <string name="overlay_position_description">选择悬浮窗在屏幕上的显示位置</string>
    <string name="overlay_position_top_left">左上</string>
    <string name="overlay_position_top_right">右上</string>
    <string name="overlay_position_bottom_left">左下</string>
    <string name="overlay_position_bottom_right">右下</string>
    <string name="overlay_position_center_top">顶部居中</string>
    <string name="overlay_position_center_bottom">底部居中</string>
-    <string name="perf_overlay_background">叠加层背景</string>
-    <string name="perf_overlay_background_description">为叠加层添加背景以提高可读性</string>
+    <string name="perf_overlay_background">悬浮窗背景</string>
+    <string name="perf_overlay_background_description">为悬浮窗添加背景以提高可读性</string>

    <!-- Device Overlay settings -->
    <string name="show_soc_overlay">显示设备信息叠加层</string>
@@ -391,7 +391,6 @@
    <string name="copied_to_clipboard">已复制到剪贴板</string>
    <string name="about_app_description">一款开源的 Switch 模拟器</string>
    <string name="contributors">贡献者</string>
-    <string name="contributors_description">Eden Android 版的诞生离不开这些人的支持</string>
    <string name="licenses_description">Android 版 Eden 离不开这些项目的支持</string>
    <string name="build">构建版本</string>
    <string name="user_data">用户数据</string>
@@ -463,6 +462,8 @@
    <string name="renderer_accuracy_description">控制 GPU 模拟的精确度。大部分游戏在性能或平衡模式下可以正常渲染，但部分游戏需要设置为精确。粒子效果通常只有在精确模式下才能正确显示。</string>
    <string name="dma_accuracy">DMA 精度</string>
    <string name="dma_accuracy_description">控制 DMA 精度。安全精度可以修复某些游戏中的问题，但在某些情况下也可能影响性能。如果不确定，请保留为“默认”。</string>
+    <string name="frame_pacing_mode">帧同步模式</string>
+    <string name="frame_pacing_mode_description">控制模拟器如何管理帧同步，以减少卡顿，使帧率表现更加平稳顺滑。</string>
    <string name="anisotropic_filtering">各向异性过滤</string>
    <string name="anisotropic_filtering_description">提高斜角的纹理质量</string>
    <string name="vram_usage_mode">显存使用模式</string>
@@ -629,7 +630,7 @@
    <string name="toggle_axis">切换轴</string>
    <string name="connected">已连接</string>
    <string name="use_system_vibrator">使用系统马达</string>
-    <string name="input_overlay">输入叠加层</string>
+    <string name="input_overlay">虚拟按键输入</string>
    <string name="vibration">震动</string>
    <string name="vibration_strength">震动强度</string>
    <string name="profile">用户配置</string>
@@ -877,19 +878,19 @@
    <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_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_touch_overlay_reset">重置虚拟按键</string>
+    <string name="emulation_touch_overlay_edit">编辑虚拟按键</string>
    <string name="emulation_snap_to_grid">截图到网格</string>
    <string name="emulation_pause">暂停模拟</string>
    <string name="emulation_unpause">继续模拟</string>
-    <string name="emulation_input_overlay">触控叠加层选项</string>
+    <string name="emulation_input_overlay">虚拟按键选项</string>
    <string name="load_amiibo">加载 Amiibo</string>
    <string name="touchscreen">触摸屏</string>
-    <string name="lock_drawer">锁定侧边栏</string>
-    <string name="unlock_drawer">解锁侧边栏</string>
+    <string name="lock_drawer">锁定侧边菜单</string>
+    <string name="unlock_drawer">解锁侧边菜单</string>
    <string name="reset">重置</string>

    <!-- Amiibo -->
@@ -903,7 +904,7 @@


    <!-- Software keyboard -->
-    <string name="software_keyboard">软键盘</string>
+    <string name="software_keyboard">软件键盘</string>

    <!-- Errors and warnings -->
    <string name="abort_button">中止</string>
@@ -914,7 +915,7 @@
    <string name="save_load_error">保存/载入发生错误</string>
    <string name="fatal_error">致命错误</string>
    <string name="fatal_error_message">发生致命错误。请查阅日志获取详细信息。\n继续模拟可能会导致崩溃。</string>
-    <string name="device_memory_inadequate">设备内存：%1$s\n建议：%2$s</string>
+    <string name="device_memory_inadequate">设备RAM：%1$s\n建议：%2$s</string>
    <string name="memory_formatted">%1$s%2$s</string>
    <string name="no_game_present">当前没有可启动的游戏！</string>

@@ -925,7 +926,7 @@
    <string name="region_australia">澳大利亚</string>
    <string name="region_china">中国</string>
    <string name="region_korea">韩国</string>
-    <string name="region_taiwan">台湾</string>
+    <string name="region_taiwan">台湾地区</string>

    <!-- Memory Layouts -->
    <string name="memory_4gb">4GB (推荐)</string>
@@ -942,21 +943,21 @@
    <string name="fast_gpu_high">高 (512)</string>

    <!-- GPU swizzle texture size -->
-    <string name="gpu_texturesizeswizzle_verysmall">极小 (16 MB)</string>
+    <string name="gpu_texturesizeswizzle_verysmall">很小 (16 MB)</string>
    <string name="gpu_texturesizeswizzle_small">较小 (32 MB)</string>
    <string name="gpu_texturesizeswizzle_normal">正常 (128 MB)</string>
    <string name="gpu_texturesizeswizzle_large">较大 (256 MB)</string>
-    <string name="gpu_texturesizeswizzle_verylarge">极大 (512 MB)</string>
+    <string name="gpu_texturesizeswizzle_verylarge">很大 (512 MB)</string>

    <!-- GPU swizzle streams -->
-    <string name="gpu_swizzle_verylow">极低 (4 MB)</string>
+    <string name="gpu_swizzle_verylow">很低 (4 MB)</string>
    <string name="gpu_swizzle_low">低 (8 MB)</string>
    <string name="gpu_swizzle_normal">正常 (16 MB)</string>
    <string name="gpu_swizzle_medium">中 (32 MB)</string>
    <string name="gpu_swizzle_high">高 (64 MB)</string>

    <!-- GPU swizzle chunks -->
-    <string name="gpu_swizzlechunk_verylow">极低 (32)</string>
+    <string name="gpu_swizzlechunk_verylow">很低 (32)</string>
    <string name="gpu_swizzlechunk_low">低 (64)</string>
    <string name="gpu_swizzlechunk_normal">正常 (128)</string>
    <string name="gpu_swizzlechunk_medium">中 (256)</string>
@@ -987,6 +988,13 @@
    <string name="dma_accuracy_unsafe">不安全</string>
    <string name="dma_accuracy_safe">安全</string>

+    <!-- Frame Pacing Mode -->
+    <string name="frame_pacing_mode_target_Auto">自动</string>
+    <string name="frame_pacing_mode_target_30">30 FPS</string>
+    <string name="frame_pacing_mode_target_60">60 FPS</string>
+    <string name="frame_pacing_mode_target_90">90 FPS</string>
+    <string name="frame_pacing_mode_target_120">120 FPS</string>
+
    <!-- ASTC Recompression Method Choices -->
    <string name="astc_recompression_uncompressed">不压缩</string>
    <!-- ASTC Recompression Method Choices -->
@@ -1054,10 +1062,8 @@
    <string name="change_app_theme">切换主题</string>
    <string name="theme_default">系统默认</string>
    <string name="theme_material_you">Material You</string>
-    <string name="app_settings">应用设置</string>
+    <string name="app_settings">App 设置</string>
    <string name="theme_and_color">主题与颜色</string>
-    <string name="fullscreen_mode">全屏模式</string>
-    <string name="fullscreen_mode_description">于应用中隐藏 Android 系统栏，若要短暂显示只需从屏幕边缘向内滑动即可。</string>

    <!-- Theme Modes -->
    <string name="change_theme_mode">更改主题模式</string>
@@ -1078,17 +1084,16 @@
    <string name="enable_qlaunch_button_description">显示启动 QLaunch 的按钮</string>

    <!-- App Language -->
-    <string name="app_language">应用使用的语言</string>
-    <string name="app_language_description">更改应用界面语言</string>
+    <string name="app_language">App 语言</string>
+    <string name="app_language_description">更改 app 界面的语言</string>
    <string name="app_language_system">跟随系统</string>
    <!-- Static Themes -->
    <string name="static_theme_color">主题颜色</string>
    <string name="eden_theme">Eden</string>
-    <string name="violet">紫色</string>
+    <string name="violet">紫色（默认）</string>
    <string name="blue">蓝色</string>
    <string name="cyan">青色</string>
    <string name="red">红色</string>
-    <string name="green">绿色</string>
    <string name="yellow">黄色</string>
    <string name="orange">橙色</string>
    <string name="pink">粉色</string>
@@ -1112,13 +1117,13 @@
    <string name="applet_hle">自定义前端</string>
    <string name="applet_lle">真实小程序</string>

-    <string name="swkbd_applet">软键盘</string>
+    <string name="swkbd_applet">软件键盘</string>

    <string name="airplane_mode">飞行模式</string>
    <string name="airplane_mode_description">将飞行模式传递给Switch操作系统</string>

-    <string name="enable_overlay">启用叠加层小程序</string>
-    <string name="enable_overlay_description">开启 Horizon 内建的叠加层小程序，要显示它请按压 home 键 1 秒</string>
+    <string name="enable_overlay">开启覆盖层小程序</string>
+    <string name="enable_overlay_description">开启 Horizon 内置的覆盖层小程序。请按住 home 键 1 秒来显示它。</string>

    <!-- Profile Management -->
    <string name="profile_manager">用户配置管理</string>
@@ -1151,7 +1156,7 @@

    <!-- Licenses screen strings -->
    <string name="licenses">许可证</string>
-    <string name="license_fidelityfx_fsr_description">AMD 的高品质画面增强技术</string>
+    <string name="license_fidelityfx_fsr_description">来自 AMD 的高品质画质升级技术</string>
    <string name="external_content">外部内容</string>
    <string name="add_folders">添加文件夹</string>

@@ -908,6 +908,7 @@
    <string name="theme_material_you">質感設計3</string>
    <string name="app_settings">Eden介面設定</string>
    <string name="theme_and_color">主題和顏色</string>
+
    <!-- Theme Modes -->
    <string name="change_theme_mode">變更主題模式</string>
    <string name="theme_mode_follow_system">跟隨系統</string>
@@ -533,6 +533,20 @@
        <item>2</item>
    </integer-array>

+    <string-array name="framePacingModeNames">
+        <item>@string/frame_pacing_mode_target_Auto</item>
+        <item>@string/frame_pacing_mode_target_30</item>
+        <item>@string/frame_pacing_mode_target_60</item>
+        <item>@string/frame_pacing_mode_target_90</item>
+        <item>@string/frame_pacing_mode_target_120</item>
+    </string-array>
+    <integer-array name="framePacingModeValues">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </integer-array>

    <string-array name="appletEntries">
        <item>@string/applet_hle</item>
@@ -479,6 +479,8 @@
    <string name="renderer_accuracy_description">Controls the GPU emulation mode. Most games render fine with Fast or Balanced modes, but Accurate is still required for some. Particles tend to only render correctly with Accurate mode.</string>
    <string name="dma_accuracy">DMA Accuracy</string>
    <string name="dma_accuracy_description">Controls the DMA precision accuracy. Safe precision can fix issues in some games, but it can also impact performance in some cases. If unsure, leave this on Default.</string>
+    <string name="frame_pacing_mode">Frame Pacing Mode</string>
+    <string name="frame_pacing_mode_description">Controls how the emulator manages frame pacing to reduce stuttering and make the frame rate smoother and more consistent.</string>
    <string name="anisotropic_filtering">Anisotropic filtering</string>
    <string name="anisotropic_filtering_description">Improves the quality of textures when viewed at oblique angles</string>
    <string name="vram_usage_mode">VRAM Usage Mode</string>
@@ -1036,6 +1038,13 @@
    <string name="dma_accuracy_unsafe">Unsafe</string>
    <string name="dma_accuracy_safe">Safe</string>

+    <!-- Frame Pacing Mode -->
+    <string name="frame_pacing_mode_target_Auto">Auto</string>
+    <string name="frame_pacing_mode_target_30">30 FPS</string>
+    <string name="frame_pacing_mode_target_60">60 FPS</string>
+    <string name="frame_pacing_mode_target_90">90 FPS</string>
+    <string name="frame_pacing_mode_target_120">120 FPS</string>
+
    <!-- ASTC Decoding Method Choices -->
    <string name="accelerate_astc_cpu" translatable="false">CPU</string>
    <string name="accelerate_astc_gpu" translatable="false">GPU</string>
@@ -222,8 +222,10 @@ if (MSVC)
    )
 else()
    target_compile_options(audio_core PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>)
+        -Werror=conversion
+
+        -Wno-sign-conversion
+    )
 endif()

 target_include_directories(audio_core PRIVATE ${OPUS_INCLUDE_DIRS})
@@ -134,8 +134,6 @@ add_library(
    typed_address.h
    uint128.h
    unique_function.h
-    random.cpp
-    random.h
    uuid.cpp
    uuid.h
    vector_math.h
@@ -146,8 +144,7 @@ add_library(
    zstd_compression.cpp
    zstd_compression.h
    fs/ryujinx_compat.h fs/ryujinx_compat.cpp
-    fs/symlink.h fs/symlink.cpp
-    httplib.h)
+    fs/symlink.h fs/symlink.cpp)

 if(WIN32)
    target_sources(common PRIVATE windows/timer_resolution.cpp
@@ -228,9 +225,8 @@ else()
 endif()

 if(CXX_CLANG)
-    target_compile_options(common PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX>:-fsized-deallocation>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unreachable-code-aggressive>)
+    target_compile_options(common PRIVATE -fsized-deallocation
+        -Werror=unreachable-code-aggressive)
    target_compile_definitions(
        common
        PRIVATE
@@ -245,7 +241,7 @@ else()
    target_link_libraries(common PUBLIC Boost::headers)
 endif()

-target_link_libraries(common PUBLIC Boost::filesystem Boost::context httplib::httplib)
+target_link_libraries(common PUBLIC Boost::filesystem Boost::context)

 if (lz4_ADDED)
    target_include_directories(common PRIVATE ${lz4_SOURCE_DIR}/lib)
@@ -30,8 +30,6 @@
 #include <sys/random.h>
 #include <mach/vm_map.h>
 #include <mach/mach.h>
-#elif defined(__FreeBSD__)
-#include <sys/shm.h>
 #endif

 // FreeBSD
@@ -505,7 +503,8 @@ public:
        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__)
+#elif defined(__FreeBSD__) && __FreeBSD__ < 13
+        // XXX Drop after FreeBSD 12.* reaches EOL on 2024-06-30
        fd = shm_open(SHM_ANON, O_RDWR, 0600);
 #elif defined(__APPLE__)
        // macOS doesn't have memfd_create, use anonymous temporary file
@@ -572,9 +571,9 @@ public:
        if (True(perms & MemoryPermission::Execute))
            prot_flags |= PROT_EXEC;
 #endif
-        int flags = (fd >= 0 ? MAP_SHARED : MAP_PRIVATE) | MAP_FIXED;
+        int flags = (fd > 0 ? MAP_SHARED : MAP_PRIVATE) | MAP_FIXED;
        void* ret = mmap(virtual_base + virtual_offset, length, prot_flags, flags, fd, host_offset);
-        ASSERT_MSG(ret != MAP_FAILED, "mmap: {} {}", strerror(errno), fd);
+        ASSERT_MSG(ret != MAP_FAILED, "mmap: {}", strerror(errno));
    }

    void Unmap(size_t virtual_offset, size_t length) {
@@ -588,8 +587,9 @@ public:
        auto [merged_pointer, merged_size] =
            free_manager.FreeBlock(virtual_base + virtual_offset, length);

-        void* ret = mmap(merged_pointer, merged_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
-        ASSERT_MSG(ret != MAP_FAILED, "mmap: {}", strerror(errno));
+        void* ret = mmap(merged_pointer, merged_size, PROT_NONE,
+                         MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+        ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno));
    }

    void Protect(size_t virtual_offset, size_t length, bool read, bool write, bool execute) {
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#define CPPHTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES 1
-#define CPPHTTPLIB_OPENSSL_SUPPORT 1
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-#endif
-#include <httplib.h>
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <optional>
-#include <random>
-#include "common/random.h"
-
-namespace Common::Random {
-    [[nodiscard]] static std::random_device& GetGlobalRandomDevice() noexcept {
-        static std::random_device g_random_device{};
-        return g_random_device;
-    }
-    [[nodiscard]] u32 Random32(u32 seed) noexcept {
-        return GetGlobalRandomDevice()();
-    }
-    [[nodiscard]] u64 Random64(u64 seed) noexcept {
-        return GetGlobalRandomDevice()();
-    }
-    [[nodiscard]] std::mt19937 GetMT19937() noexcept {
-        return std::mt19937(GetGlobalRandomDevice()());
-    }
-}
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <random>
-#include "common/common_types.h"
-
-namespace Common::Random {
-    [[nodiscard]] u32 Random32(u32 seed) noexcept;
-    [[nodiscard]] u64 Random64(u64 seed) noexcept;
-    [[nodiscard]] std::mt19937 GetMT19937() noexcept;
-}
@@ -186,7 +186,7 @@ bool IsFastmemEnabled() {
    // Only 4kb systems support host MMU right now
    // TODO: Support this
    return getpagesize() == 4096;
-#elif !defined(__APPLE__) && !defined(__ANDROID__) && !defined(_WIN32) && !defined(__linux__) && !defined(__FreeBSD__)
+#elif !defined(__APPLE__) && !defined(__ANDROID__) && !defined(_WIN32) && !defined(__linux__)
    return false;
 #else
    return true;
@@ -287,6 +287,8 @@ struct Values {
                                           true,
                                           &use_custom_cpu_ticks};

+    SwitchableSetting<bool> vtable_bouncing{linkage, true, "vtable_bouncing", Category::Cpu};
+
    Setting<bool> cpuopt_page_tables{linkage, true, "cpuopt_page_tables", Category::CpuDebug};
    Setting<bool> cpuopt_block_linking{linkage, true, "cpuopt_block_linking", Category::CpuDebug};
    Setting<bool> cpuopt_return_stack_buffer{linkage, true, "cpuopt_return_stack_buffer",
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
@@ -116,20 +116,122 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
 }

 std::string UTF16ToUTF8(std::u16string_view input) {
-    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
-    return convert.to_bytes(input.data(), input.data() + input.size());
+    std::string result;
+    result.reserve(input.size() * 4);
+    for (size_t i = 0; i < input.size(); ++i) {
+        uint32_t code = input[i];
+        // Handle surrogate pairs
+        if (code >= 0xD800 && code <= 0xDBFF) {
+            if (i + 1 < input.size()) {
+                uint32_t low = input[i + 1];
+                if (low >= 0xDC00 && low <= 0xDFFF) {
+                    code = ((code - 0xD800) << 10) + (low - 0xDC00) + 0x10000;
+                    ++i;
+                }
+            }
+        }
+        if (code <= 0x7F) {
+            result.push_back(char(code));
+        } else if (code <= 0x7FF) {
+            result.push_back(char(0xC0 | (code >> 6)));
+            result.push_back(char(0x80 | (code & 0x3F)));
+        } else if (code <= 0xFFFF) {
+            result.push_back(char(0xE0 | (code >> 12)));
+            result.push_back(char(0x80 | ((code >> 6) & 0x3F)));
+            result.push_back(char(0x80 | (code & 0x3F)));
+        } else {
+            result.push_back(char(0xF0 | (code >> 18)));
+            result.push_back(char(0x80 | ((code >> 12) & 0x3F)));
+            result.push_back(char(0x80 | ((code >> 6) & 0x3F)));
+            result.push_back(char(0x80 | (code & 0x3F)));
+        }
+    }
+    return result;
 }

 std::u16string UTF8ToUTF16(std::string_view input) {
-    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
-    return convert.from_bytes(input.data(), input.data() + input.size());
+    std::u16string result;
+    result.reserve(input.size() * 2);
+    for (size_t i = 0; i < input.size(); ) {
+        uint32_t code = 0;
+        unsigned char c = input[i];
+        size_t len = 0;
+        if ((c & 0x80) == 0) {
+            code = c;
+            len = 1;
+        } else if ((c & 0xE0) == 0xC0) {
+            code = c & 0x1F;
+            len = 2;
+        } else if ((c & 0xF0) == 0xE0) {
+            code = c & 0x0F;
+            len = 3;
+        } else if ((c & 0xF8) == 0xF0) {
+            code = c & 0x07;
+            len = 4;
+        } else {
+            ++i;
+            continue;
+        }
+        if (i + len - 1 >= input.size())
+            break;
+        for (size_t j = 1; j <= len - 1; ++j) {
+            if ((input[i + j] & 0xC0) != 0x80) {
+                code = 0xFFFD;
+                break;
+            }
+            code = (code << 6) | (input[i + j] & 0x3F);
+        }
+        if (code <= 0xFFFF) {
+            result.push_back(char16_t(code));
+        } else {
+            code -= 0x10000;
+            result.push_back(char16_t(0xD800 + (code >> 10)));
+            result.push_back(char16_t(0xDC00 + (code & 0x3FF)));
+        }
+        i += len;
+    }
+    return result;
 }

 std::u32string UTF8ToUTF32(std::string_view input) {
-    std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> convert;
-    return convert.from_bytes(input.data(), input.data() + input.size());
+    std::u32string result;
+    result.reserve(input.size());
+    for (size_t i = 0; i < input.size(); ) {
+        uint32_t code = 0;
+        unsigned char c = input[i];
+        size_t len = 0;
+        if ((c & 0x80) == 0) {
+            code = c;
+            len = 1;
+        } else if ((c & 0xE0) == 0xC0) {
+            code = c & 0x1F;
+            len = 2;
+        } else if ((c & 0xF0) == 0xE0) {
+            code = c & 0x0F;
+            len = 3;
+        } else if ((c & 0xF8) == 0xF0) {
+            code = c & 0x07;
+            len = 4;
+        } else {
+            ++i;
+            continue;
+        }
+        if (i + len - 1 >= input.size())
+            break;
+        for (size_t j = 1; j <= len - 1; ++j) {
+            if ((input[i + j] & 0xC0) != 0x80) {
+                code = 0xFFFD;
+                break;
+            }
+            code = (code << 6) | (input[i + j] & 0x3F);
+        }
+        result.push_back(code);
+        i += len;
+    }
+    return result;
 }

+
 #ifdef _WIN32
 static std::wstring CPToUTF16(u32 code_page, std::string_view input) {
    const auto size =
@@ -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 2021 yuzu Emulator Project
@@ -218,6 +218,12 @@ public:
        return t0;
    }

+    u64 GenerateRandomU64() {
+        const u32 lo = this->GenerateRandomU32();
+        const u32 hi = this->GenerateRandomU32();
+        return (u64{hi} << 32) | u64{lo};
+    }
+
    float GenerateRandomF32() {
        // Floats have 24 bits of mantissa.
        constexpr u32 MantissaBits = 24;
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -13,7 +10,6 @@
 #include "common/assert.h"
 #include "common/tiny_mt.h"
 #include "common/uuid.h"
-#include "common/random.h"

 namespace Common {

@@ -179,16 +175,21 @@ u128 UUID::AsU128() const {
 }

 UUID UUID::MakeRandom() {
-    return MakeRandomWithSeed(Common::Random::Random32(0));
+    std::random_device device;
+
+    return MakeRandomWithSeed(device());
 }

 UUID UUID::MakeRandomWithSeed(u32 seed) {
    // Create and initialize our RNG.
    TinyMT rng;
    rng.Initialize(seed);
+
    UUID uuid;
+
    // Populate the UUID with random bytes.
    rng.GenerateRandomBytes(uuid.uuid.data(), sizeof(UUID));
+
    return uuid;
 }

@@ -1195,13 +1195,13 @@ if (MSVC)
    )
 else()
    target_compile_options(core PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type>
+        -Werror=conversion
+        -Wno-sign-conversion
+        -Wno-cast-function-type
        $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>)
    # pre-clang19 will spam with "OH DID YOU MEAN THIS?" otherwise...
    if (CXX_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19)
-        target_compile_options(core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>)
+        target_compile_options(core PRIVATE -Wno-cast-function-type-mismatch)
    endif()
 endif()

@@ -1246,7 +1246,7 @@ if (HAS_NCE)
    target_link_libraries(core PRIVATE merry::oaknut)
 endif()

-if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64)
+if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
    target_sources(core PRIVATE
        arm/dynarmic/arm_dynarmic.h
        arm/dynarmic/arm_dynarmic_64.cpp
@@ -1269,6 +1269,7 @@ endif()
 target_sources(core PRIVATE hle/service/ssl/ssl_backend_openssl.cpp)

 target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
+target_compile_definitions(core PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)

 # TODO

@@ -186,7 +186,7 @@ void ArmDynarmic32::MakeJit(Common::PageTable* page_table) {
        config.only_detect_misalignment_via_page_table_on_page_boundary = true;

        config.fastmem_pointer = page_table->fastmem_arena ?
-            std::optional<uintptr_t>{uintptr_t(page_table->fastmem_arena)} :
+            std::optional<uintptr_t>{reinterpret_cast<uintptr_t>(page_table->fastmem_arena)} :
            std::nullopt;

        config.fastmem_exclusive_access = config.fastmem_pointer  != std::nullopt;
@@ -286,6 +286,10 @@ void ArmDynarmic32::MakeJit(Common::PageTable* page_table) {
    // Curated optimizations
    case Settings::CpuAccuracy::Auto:
        config.unsafe_optimizations = true;
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__) || defined(__HAIKU__) || defined(__DragonFly__) || defined(__NetBSD__)
+        config.fastmem_pointer = std::nullopt;
+        config.fastmem_exclusive_access = false;
+#endif
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreStandardFPCRValue;
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_InaccurateNaN;
@@ -300,10 +304,6 @@ void ArmDynarmic32::MakeJit(Common::PageTable* page_table) {
    default:
        break;
    }
-    if (!Settings::IsFastmemEnabled()) {
-        config.fastmem_pointer = std::nullopt;
-        config.fastmem_exclusive_access = false;
-    }
    m_jit.emplace(config);
 }

@@ -338,6 +338,10 @@ void ArmDynarmic64::MakeJit(Common::PageTable* page_table, std::size_t address_s
    // Safe optimisations
    case Settings::CpuAccuracy::Auto:
        config.unsafe_optimizations = true;
+#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32)
+        config.fastmem_pointer = std::nullopt;
+        config.fastmem_exclusive_access = false;
+#endif
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
        config.fastmem_address_space_bits = 64;
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreGlobalMonitor;
@@ -351,10 +355,6 @@ void ArmDynarmic64::MakeJit(Common::PageTable* page_table, std::size_t address_s
    default:
        break;
    }
-    if (!Settings::IsFastmemEnabled()) {
-        config.fastmem_pointer = std::nullopt;
-        config.fastmem_exclusive_access = false;
-    }
    m_jit.emplace(config);
 }

@@ -59,10 +59,14 @@ CallbackOrAccessOneWord DynarmicCP15::CompileSendOneWord(bool two, unsigned opc1
 #if defined(_MSC_VER) && defined(ARCHITECTURE_x86_64)
                    _mm_mfence();
                    _mm_lfence();
+#elif defined(ARCHITECTURE_x86_64)
+                    asm volatile("mfence\n\tlfence\n\t" : : : "memory");
 #elif defined(_MSC_VER) && defined(ARCHITECTURE_arm64)
                    _Memory_barrier();
+#elif defined(ARCHITECTURE_arm64)
+                    asm volatile("dsb sy\n\t" : : : "memory");
 #else
-                    __sync_synchronize();
+#error Unsupported architecture
 #endif
                    return 0;
                },
@@ -74,10 +78,14 @@ CallbackOrAccessOneWord DynarmicCP15::CompileSendOneWord(bool two, unsigned opc1
                [](void*, std::uint32_t, std::uint32_t) -> std::uint64_t {
 #if defined(_MSC_VER) && defined(ARCHITECTURE_x86_64)
                    _mm_mfence();
+#elif defined(ARCHITECTURE_x86_64)
+                    asm volatile("mfence\n\t" : : : "memory");
 #elif defined(_MSC_VER) && defined(ARCHITECTURE_arm64)
                    _Memory_barrier();
+#elif defined(ARCHITECTURE_arm64)
+                    asm volatile("dmb sy\n\t" : : : "memory");
 #else
-                    __sync_synchronize();
+#error Unsupported architecture
 #endif
                    return 0;
                },
@@ -773,11 +773,7 @@ std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, m
    bool was_executed = false;

    auto decoder = Dynarmic::A64::Decode<VisitorBase>(instruction);
-    if (decoder) {
-        was_executed = decoder->get().call(visitor, instruction);
-    } else {
-        was_executed = false;
-    }
+    was_executed = decoder.get().call(visitor, instruction);
    return was_executed ? std::optional<u64>(pc + 4) : std::nullopt;
 }

@@ -12,7 +12,6 @@
 #include "common/fs/path_util.h"
 #include "common/hex_util.h"
 #include "common/logging.h"
-#include "common/random.h"
 #include "common/string_util.h"
 #include "core/crypto/key_manager.h"
 #include "core/file_sys/card_image.h"
@@ -491,13 +490,17 @@ std::vector<NcaID> PlaceholderCache::List() const {
 }

 NcaID PlaceholderCache::Generate() {
-    auto gen = Common::Random::GetMT19937();
+    std::random_device device;
+    std::mt19937 gen(device());
    std::uniform_int_distribution<u64> distribution(1, (std::numeric_limits<u64>::max)());
+
    NcaID out{};
+
    const auto v1 = distribution(gen);
    const auto v2 = distribution(gen);
    std::memcpy(out.data(), &v1, sizeof(u64));
    std::memcpy(out.data() + sizeof(u64), &v2, sizeof(u64));
+
    return out;
 }

@@ -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 2021 yuzu Emulator Project
@@ -7,7 +7,6 @@
 #include <random>

 #include "common/literals.h"
-#include "common/random.h"
 #include "common/settings.h"

 #include "core/hle/kernel/board/nintendo/nx/k_system_control.h"
@@ -202,8 +201,15 @@ u64 GenerateUniformRange(u64 min, u64 max, F f) {

 } // Anonymous namespace

+u64 KSystemControl::GenerateRandomU64() {
+    std::random_device device;
+    std::mt19937 gen(device());
+    std::uniform_int_distribution<u64> distribution(1, (std::numeric_limits<u64>::max)());
+    return distribution(gen);
+}
+
 u64 KSystemControl::GenerateRandomRange(u64 min, u64 max) {
-    return GenerateUniformRange(min, max, Common::Random::GetMT19937());
+    return GenerateUniformRange(min, max, GenerateRandomU64);
 }

 size_t KSystemControl::CalculateRequiredSecureMemorySize(size_t size, u32 pool) {
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -36,6 +33,7 @@ public:

    // Randomness.
    static u64 GenerateRandomRange(u64 min, u64 max);
+    static u64 GenerateRandomU64();

    // Secure Memory.
    static size_t CalculateRequiredSecureMemorySize(size_t size, u32 pool);
@@ -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 2021 yuzu Emulator Project
@@ -14,7 +14,6 @@
 #include "common/bit_util.h"
 #include "common/common_types.h"
 #include "common/tiny_mt.h"
-#include "common/random.h"
 #include "core/hle/kernel/k_system_control.h"

 namespace Kernel {
@@ -24,7 +23,7 @@ public:
    class RandomBitGenerator {
    public:
        RandomBitGenerator() {
-            m_rng.Initialize(u32(Common::Random::Random64(0)));
+            m_rng.Initialize(static_cast<u32>(KSystemControl::GenerateRandomU64()));
        }

        u64 SelectRandomBit(u64 bitmap) {
@@ -20,7 +20,6 @@
 #include "common/fiber.h"
 #include "common/logging.h"
 #include "common/settings.h"
-#include "common/random.h"
 #include "core/core.h"
 #include "core/cpu_manager.h"
 #include "core/hardware_properties.h"
@@ -46,7 +45,8 @@ namespace {

 constexpr inline s32 TerminatingThreadPriority = Kernel::Svc::SystemThreadPriorityHighest - 1;

-static void ResetThreadContext32(Kernel::Svc::ThreadContext& ctx, u64 stack_top, u64 entry_point, u64 arg) {
+static void ResetThreadContext32(Kernel::Svc::ThreadContext& ctx, u64 stack_top, u64 entry_point,
+                                 u64 arg) {
    ctx = {};
    ctx.r[0] = arg;
    ctx.r[15] = entry_point;
@@ -55,10 +55,11 @@ static void ResetThreadContext32(Kernel::Svc::ThreadContext& ctx, u64 stack_top,
    ctx.fpsr = 0;
 }

-static void ResetThreadContext64(Kernel::Svc::ThreadContext& ctx, u64 stack_top, u64 entry_point, u64 arg) {
+static void ResetThreadContext64(Kernel::Svc::ThreadContext& ctx, u64 stack_top, u64 entry_point,
+                                 u64 arg) {
    ctx = {};
    ctx.r[0] = arg;
-    ctx.r[18] = Common::Random::Random64(0) | 1;
+    ctx.r[18] = Kernel::KSystemControl::GenerateRandomU64() | 1;
    ctx.pc = entry_point;
    ctx.sp = stack_top;
    ctx.fpcr = 0;
@@ -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
@@ -103,12 +103,26 @@ void PhysicalCore::RunThread(Kernel::KThread* thread) {
        const bool data_abort = True(hr & Core::HaltReason::DataAbort);
        const bool interrupt = True(hr & Core::HaltReason::BreakLoop);

+        bool may_abort = true; // Ignore aborting virtual functions (for debugging)
+        if (prefetch_abort && ::Settings::values.vtable_bouncing) {
+            auto& lock = m_kernel.GlobalSchedulerContext().SchedulerLock();
+            lock.Lock();
+            Kernel::Svc::ThreadContext ctx;
+            interface->GetContext(ctx);
+            LOG_WARNING(Core_ARM, "vtable bouncing {:016X}", ctx.lr);
+            ctx.pc = ctx.lr;
+            ctx.r[0] = 0;
+            interface->SetContext(ctx);
+            lock.Unlock();
+            may_abort = false;
+        }
+
        // Since scheduling may occur here, we cannot use any cached
        // state after returning from calls we make.

        // Notify the debugger and go to sleep if a breakpoint was hit,
        // or if the thread is unable to continue for any reason.
-        if (breakpoint || prefetch_abort) {
+        if (breakpoint || (prefetch_abort && may_abort)) {
            if (breakpoint) {
                interface->RewindBreakpointInstruction();
            }
@@ -1,13 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <condition_variable>
-#include <mutex>
-#include <thread>
-
 #include "core/core.h"
 #include "core/hle/kernel/k_thread.h"
 #include "core/hle/kernel/svc.h"
@@ -15,62 +8,14 @@

 namespace Kernel::Svc {

-constexpr auto MAX_MSG_TIME = std::chrono::milliseconds(250);
-const auto MAX_MSG_SIZE = 0x1000;
-
-static std::string msg_buffer;
-static std::mutex msg_mutex;
-static std::condition_variable msg_cv;
-static std::chrono::steady_clock::time_point last_msg_time;
-static bool worker_running = true;
-static std::unique_ptr<std::thread> flush_thread;
-static std::once_flag start_flag;
-
-static void FlushDbgLoop() {
-    while (true) {
-        std::unique_lock lock(msg_mutex);
-
-        msg_cv.wait(lock, [] { return !msg_buffer.empty() || !worker_running; });
-        if (!worker_running && msg_buffer.empty()) break;
-
-        auto timeout = last_msg_time + MAX_MSG_TIME;
-        bool woke_early = msg_cv.wait_until(lock, timeout, [] {
-            return msg_buffer.size() >= MAX_MSG_SIZE || !worker_running;
-        });
-
-        if (!woke_early || msg_buffer.size() >= MAX_MSG_SIZE || !worker_running) {
-            if (!msg_buffer.empty()) {
-                // Remove trailing newline as LOG_INFO adds that anyways
-                if (msg_buffer.back() == '\n')
-                    msg_buffer.pop_back();
-
-                LOG_INFO(Debug_Emulated, "\n{}", msg_buffer);
-                msg_buffer.clear();
-            }
-            if (!worker_running) break;
-        }
-    }
-}
-
 /// Used to output a message on a debug hardware unit - does nothing on a retail unit
 Result OutputDebugString(Core::System& system, u64 address, u64 len) {
    R_SUCCEED_IF(len == 0);

-    // Only start the thread the very first time this function is called
-    std::call_once(start_flag, [] {
-        flush_thread = std::make_unique<std::thread>(FlushDbgLoop);
-    });
+    std::string str(len, '\0');
+    GetCurrentMemory(system.Kernel()).ReadBlock(address, str.data(), str.size());
+    LOG_INFO(Debug_Emulated, "{}", str);

-    {
-        std::lock_guard lock(msg_mutex);
-        const auto old_size = msg_buffer.size();
-        msg_buffer.resize(old_size + len);
-        GetCurrentMemory(system.Kernel()).ReadBlock(address, msg_buffer.data() + old_size, len);
-
-        last_msg_time = std::chrono::steady_clock::now();
-    }
-
-    msg_cv.notify_one();
    R_SUCCEED();
 }

@@ -82,16 +27,4 @@ Result OutputDebugString64From32(Core::System& system, uint32_t debug_str, uint3
    R_RETURN(OutputDebugString(system, debug_str, len));
 }

-struct BufferAutoFlush {
-    ~BufferAutoFlush() {
-        {
-            std::lock_guard lock(msg_mutex);
-            worker_running = false;
-        }
-        msg_cv.notify_all();
-        if (flush_thread && flush_thread->joinable()) flush_thread->join();
-    }
-};
-static BufferAutoFlush auto_flusher;
-
 } // namespace Kernel::Svc
@@ -15,7 +15,9 @@
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>

-#include "common/httplib.h"
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#include <httplib.h>
+#endif

 #include <chrono>
 #include <cstring>
@@ -101,6 +103,8 @@ std::vector<u8> TryLoadFromDisk(const std::filesystem::path& path) {

 std::vector<u8> DownloadImage(const std::string& url_path, const std::filesystem::path& cache_path) {
    LOG_INFO(Service_BCAT, "Downloading image: https://eden-emu.dev{}", url_path);
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
    try {
        httplib::Client cli("https://eden-emu.dev");
        cli.set_follow_location(true);
@@ -124,6 +128,8 @@ std::vector<u8> DownloadImage(const std::string& url_path, const std::filesystem
    } catch (...) {
        LOG_WARNING(Service_BCAT, "Failed to download: {}", url_path);
    }
+#endif
+
    return {};
 }

@@ -226,6 +232,8 @@ void WriteCachedJson(std::string_view json) {
 }

 std::optional<std::string> DownloadReleasesJson() {
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
    try {
        httplib::SSLClient cli{"api.github.com", 443};
        cli.set_connection_timeout(10);
@@ -247,6 +255,7 @@ std::optional<std::string> DownloadReleasesJson() {
    } catch (...) {
        LOG_WARNING(Service_BCAT, " failed to download releases");
    }
+#endif
    return std::nullopt;
 }

@@ -438,20 +438,20 @@ void WriteOutArgument(bool is_domain, CallArguments& args, u8* raw_data, HLERequ

 template <bool Domain, typename T, typename... A>
 void CmifReplyWrapImpl(HLERequestContext& ctx, T& t, Result (T::*f)(A...)) {
-    const auto mgr = ctx.GetManager().get();
    // Verify domain state.
    if constexpr (!Domain) {
-        const bool is_domain = mgr ? mgr->IsDomain() : false;
-        ASSERT_MSG(!is_domain,
-            "Non-domain reply used on domain session\n"
-            "Service={} (TIPC={} CmdType={} Cmd=0x{:08X}\n"
-            "HasDomainHeader={} DomainHandlers={}\nDesc={}",
-            t.GetServiceName(), ctx.IsTipc(),
-            u32(ctx.GetCommandType()), u32(ctx.GetCommand()),
-            ctx.HasDomainMessageHeader(), mgr ? u32(mgr->DomainHandlerCount()) : 0u,
-            ctx.Description());
+        const auto _mgr = ctx.GetManager();
+        const bool _is_domain = _mgr ? _mgr->IsDomain() : false;
+        ASSERT_MSG(!_is_domain,
+                   "Non-domain reply used on domain session\n"
+                   "Service={} (TIPC={} CmdType={} Cmd=0x{:08X}\n"
+                   "HasDomainHeader={} DomainHandlers={}\nDesc={}",
+                   t.GetServiceName(), ctx.IsTipc(),
+                   static_cast<u32>(ctx.GetCommandType()), static_cast<u32>(ctx.GetCommand()),
+                   ctx.HasDomainMessageHeader(), _mgr ? static_cast<u32>(_mgr->DomainHandlerCount()) : 0u,
+                   ctx.Description());
    }
-    const bool is_domain = Domain ? mgr->IsDomain() : false;
+    const bool is_domain = Domain ? ctx.GetManager()->IsDomain() : false;

    static_assert(ConstIfReference<A...>(), "Arguments taken by reference must be const");
    using MethodArguments = std::tuple<std::remove_cvref_t<A>...>;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lizzie	9f7e9b1864	license	2026-03-24 23:19:38 +00:00
lizzie	71e713483f	[common] use handrolled string utility conversions instead of wstring codecvt Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-03-24 23:16:45 +00:00