ONE last parentehsis

wtf
ok fix parenthesis?
2026-08-15 13:16:43 +00:00 · 2026-03-26 03:43:45 +00:00 · 2026-03-26 03:42:38 +00:00 · 2026-03-26 03:41:28 +00:00 · 2026-03-26 03:41:28 +00:00 · 2026-03-26 03:41:28 +00:00
178 changed files with 1125 additions and 2061 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
@@ -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
@@ -158,8 +158,7 @@ if (CXX_CLANG_CL)
    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()

@@ -402,8 +401,7 @@ if (Boost_ADDED)
        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>
-        )
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough>)
    endif()
 endif()

@@ -441,9 +439,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>
-            )
+            target_compile_options(opus PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-function-declaration>)
        endif()
    endif()

@@ -486,10 +482,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 +522,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)
@@ -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"
-  }
-}
@@ -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:

@@ -76,6 +76,9 @@ if (ARCHITECTURE_riscv64)
    AddJsonPackage(biscuit)
 endif()

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

@@ -208,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%",
@@ -133,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() {
@@ -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 -->
@@ -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>
@@ -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>
@@ -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 -->
@@ -468,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>
@@ -992,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 -->
@@ -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 -->
@@ -462,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>
@@ -986,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 -->
@@ -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>
@@ -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

@@ -11,11 +8,10 @@

 namespace AudioCore {

-AudioCore::AudioCore(Core::System& system) {
-    audio_manager.emplace();
+AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>()} {
    CreateSinks();
    // Must be created after the sinks
-    adsp.emplace(system, *output_sink);
+    adsp = std::make_unique<ADSP::ADSP>(system, *output_sink);
 }

 AudioCore ::~AudioCore() {
@@ -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

@@ -18,7 +15,10 @@ class System;

 namespace AudioCore {

-/// @brief Main audio class, stored inside the core, and holding the audio manager, all sinks, and the ADSP.
+class AudioManager;
+/**
+ * Main audio class, stored inside the core, and holding the audio manager, all sinks, and the ADSP.
+ */
 class AudioCore {
 public:
    explicit AudioCore(Core::System& system);
@@ -50,22 +50,27 @@ public:
     */
    Sink::Sink& GetInputSink();

-    /// @brief Get the ADSP.
-    /// @return Ref to the ADSP.
+    /**
+     * Get the ADSP.
+     *
+     * @return Ref to the ADSP.
+     */
    ADSP::ADSP& ADSP();

 private:
-    /// @brief Create the sinks on startup.
+    /**
+     * Create the sinks on startup.
+     */
    void CreateSinks();

    /// Main audio manager for audio in/out
-    std::optional<AudioManager> audio_manager;
+    std::unique_ptr<AudioManager> audio_manager;
    /// Sink used for audio renderer and audio out
    std::unique_ptr<Sink::Sink> output_sink;
    /// Sink used for audio input
    std::unique_ptr<Sink::Sink> input_sink;
    /// The ADSP in the sysmodule
-    std::optional<ADSP::ADSP> adsp;
+    std::unique_ptr<ADSP::ADSP> adsp;
 };

 } // namespace AudioCore
@@ -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

@@ -44,7 +41,8 @@ void Manager::ReleaseSessionId(const size_t session_id) {
 Result Manager::LinkToManager() {
    std::scoped_lock l{mutex};
    if (!linked_to_manager) {
-        system.AudioCore().GetAudioManager().SetInManager(std::bind(&Manager::BufferReleaseAndRegister, this));
+        AudioManager& manager{system.AudioCore().GetAudioManager()};
+        manager.SetInManager(std::bind(&Manager::BufferReleaseAndRegister, this));
        linked_to_manager = true;
    }

@@ -1,77 +1,81 @@
-// 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

 #include "audio_core/audio_manager.h"
-#include "common/thread.h"
 #include "core/core.h"
 #include "core/hle/service/audio/errors.h"

 namespace AudioCore {

 AudioManager::AudioManager() {
-    thread = std::jthread([this](std::stop_token stop_token) {
-        Common::SetCurrentThreadName("AudioManager");
-        std::unique_lock l{events.GetAudioEventLock()};
-        events.ClearEvents();
-        while (!stop_token.stop_requested()) {
-            const auto timed_out{events.Wait(l, std::chrono::seconds(2))};
-            if (events.CheckAudioEventSet(Event::Type::Max)) {
-                break;
-            }
-            for (size_t i = 0; i < buffer_events.size(); i++) {
-                const auto event_type = Event::Type(i);
-                if (events.CheckAudioEventSet(event_type) || timed_out) {
-                    if (buffer_events[i]) {
-                        buffer_events[i]();
-                    }
-                }
-                events.SetAudioEvent(event_type, false);
-            }
-        }
-    });
+    thread = std::jthread([this]() { ThreadFunc(); });
 }

 void AudioManager::Shutdown() {
+    running = false;
    events.SetAudioEvent(Event::Type::Max, true);
-    if (thread.joinable()) {
-        thread.request_stop();
-        thread.join();
-    }
+    thread.join();
 }

 Result AudioManager::SetOutManager(BufferEventFunc buffer_func) {
-    if (thread.joinable()) {
-        std::scoped_lock l{lock};
-        const auto index{events.GetManagerIndex(Event::Type::AudioOutManager)};
-        if (buffer_events[index] == nullptr) {
-            buffer_events[index] = std::move(buffer_func);
-            needs_update = true;
-            events.SetAudioEvent(Event::Type::AudioOutManager, true);
-        }
-        return ResultSuccess;
+    if (!running) {
+        return Service::Audio::ResultOperationFailed;
    }
-    return Service::Audio::ResultOperationFailed;
+
+    std::scoped_lock l{lock};
+
+    const auto index{events.GetManagerIndex(Event::Type::AudioOutManager)};
+    if (buffer_events[index] == nullptr) {
+        buffer_events[index] = std::move(buffer_func);
+        needs_update = true;
+        events.SetAudioEvent(Event::Type::AudioOutManager, true);
+    }
+    return ResultSuccess;
 }

 Result AudioManager::SetInManager(BufferEventFunc buffer_func) {
-    if (thread.joinable()) {
-        std::scoped_lock l{lock};
-        const auto index{events.GetManagerIndex(Event::Type::AudioInManager)};
-        if (buffer_events[index] == nullptr) {
-            buffer_events[index] = std::move(buffer_func);
-            needs_update = true;
-            events.SetAudioEvent(Event::Type::AudioInManager, true);
-        }
-        return ResultSuccess;
+    if (!running) {
+        return Service::Audio::ResultOperationFailed;
    }
-    return Service::Audio::ResultOperationFailed;
+
+    std::scoped_lock l{lock};
+
+    const auto index{events.GetManagerIndex(Event::Type::AudioInManager)};
+    if (buffer_events[index] == nullptr) {
+        buffer_events[index] = std::move(buffer_func);
+        needs_update = true;
+        events.SetAudioEvent(Event::Type::AudioInManager, true);
+    }
+    return ResultSuccess;
 }

 void AudioManager::SetEvent(const Event::Type type, const bool signalled) {
    events.SetAudioEvent(type, signalled);
 }

+void AudioManager::ThreadFunc() {
+    std::unique_lock l{events.GetAudioEventLock()};
+    events.ClearEvents();
+    running = true;
+
+    while (running) {
+        const auto timed_out{events.Wait(l, std::chrono::seconds(2))};
+
+        if (events.CheckAudioEventSet(Event::Type::Max)) {
+            break;
+        }
+
+        for (size_t i = 0; i < buffer_events.size(); i++) {
+            const auto event_type = static_cast<Event::Type>(i);
+
+            if (events.CheckAudioEventSet(event_type) || timed_out) {
+                if (buffer_events[i]) {
+                    buffer_events[i]();
+                }
+            }
+            events.SetAudioEvent(event_type, false);
+        }
+    }
+}
+
 } // namespace AudioCore
@@ -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

@@ -69,6 +66,13 @@ public:
    void SetEvent(Event::Type type, bool signalled);

 private:
+    /**
+     * Main thread, waiting on a manager signal and calling the registered function.
+     */
+    void ThreadFunc();
+
+    /// Is the main thread running?
+    std::atomic<bool> running{};
    /// Unused
    bool needs_update{};
    /// Events to be set and signalled
@@ -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

@@ -43,7 +40,8 @@ void Manager::ReleaseSessionId(const size_t session_id) {
 Result Manager::LinkToManager() {
    std::scoped_lock l{mutex};
    if (!linked_to_manager) {
-        system.AudioCore().GetAudioManager().SetOutManager(std::bind(&Manager::BufferReleaseAndRegister, this));
+        AudioManager& manager{system.AudioCore().GetAudioManager()};
+        manager.SetOutManager(std::bind(&Manager::BufferReleaseAndRegister, this));
        linked_to_manager = true;
    }

@@ -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) {
@@ -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;
@@ -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);
 }

@@ -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;
 }

@@ -347,7 +347,7 @@ struct System::Impl {

        // Register with applet manager
        // All threads are started, begin main process execution, now that we're in the clear
-        applet_manager.CreateAndInsertByFrontendAppletParameters(std::make_unique<Service::Process>(*std::move(process)), params);
+        applet_manager.CreateAndInsertByFrontendAppletParameters(std::move(process), params);

        if (Settings::values.gamecard_inserted) {
            if (Settings::values.gamecard_current_game) {
@@ -268,7 +268,7 @@ void AppletManager::SetWindowSystem(WindowSystem* window_system) {

    if (Settings::values.enable_overlay && m_window_system->GetOverlayDisplayApplet() == nullptr) {
        if (auto overlay_process = CreateProcess(m_system, static_cast<u64>(AppletProgramId::OverlayDisplay), 0, 0)) {
-            auto overlay_applet = std::make_shared<Applet>(m_system, std::make_unique<Service::Process>(*std::move(overlay_process)), false);
+            auto overlay_applet = std::make_shared<Applet>(m_system, std::move(overlay_process), false);
            overlay_applet->program_id = static_cast<u64>(AppletProgramId::OverlayDisplay);
            overlay_applet->applet_id = AppletId::OverlayDisplay;
            overlay_applet->type = AppletType::OverlayApplet;
@@ -1,11 +1,9 @@
-// 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 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <thread>
-#include "common/thread.h"
 #include "core/core.h"
 #include "core/hle/service/am/am_types.h"
 #include "core/hle/service/am/button_poller.h"
@@ -36,15 +34,16 @@ ButtonPressDuration ClassifyPressDuration(std::chrono::steady_clock::time_point

 } // namespace

-ButtonPoller::ButtonPoller(Core::System& system, WindowSystem& window_system) {
+ButtonPoller::ButtonPoller(Core::System& system, WindowSystem& window_system)
+    : m_window_system(window_system) {
    // TODO: am reads this from the home button state in hid, which is controller-agnostic.
    Core::HID::ControllerUpdateCallback engine_callback{
-        .on_change = [this, &window_system](Core::HID::ControllerTriggerType type) {
-            if (type == Core::HID::ControllerTriggerType::Button) {
-                std::unique_lock lk{m_mutex};
-                OnButtonStateChanged(window_system);
-            }
-        },
+        .on_change =
+            [this](Core::HID::ControllerTriggerType type) {
+                if (type == Core::HID::ControllerTriggerType::Button) {
+                    this->OnButtonStateChanged();
+                }
+            },
        .is_npad_service = true,
    };

@@ -53,35 +52,25 @@ ButtonPoller::ButtonPoller(Core::System& system, WindowSystem& window_system) {
    m_player1 = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
    m_player1_key = m_player1->SetCallback(engine_callback);

-    m_thread = std::jthread([this, &window_system](std::stop_token stop_token) {
-        Common::SetCurrentThreadName("ButtonPoller");
-        while (!stop_token.stop_requested()) {
-            using namespace std::chrono_literals;
-            std::unique_lock lk{m_mutex};
-            m_cv.wait_for(lk, 50ms);
-            if (stop_token.stop_requested())
-                break;
-            OnButtonStateChanged(window_system);
-            std::this_thread::sleep_for(5ms);
-        }
-    });
+    m_thread = std::thread([this] { this->ThreadLoop(); });
 }

 ButtonPoller::~ButtonPoller() {
    m_handheld->DeleteCallback(m_handheld_key);
    m_player1->DeleteCallback(m_player1_key);
+    m_stop = true;
    m_cv.notify_all();
    if (m_thread.joinable()) {
-        m_thread.request_stop();
        m_thread.join();
    }
 }

-void ButtonPoller::OnButtonStateChanged(WindowSystem& window_system) {
-    auto const home_button = m_handheld->GetHomeButtons().home.Value()
-        || m_player1->GetHomeButtons().home.Value();
-    auto const capture_button = m_handheld->GetCaptureButtons().capture.Value()
-        || m_player1->GetCaptureButtons().capture.Value();
+void ButtonPoller::OnButtonStateChanged() {
+    std::lock_guard lk{m_mutex};
+    const bool home_button =
+        m_handheld->GetHomeButtons().home.Value() || m_player1->GetHomeButtons().home.Value();
+    const bool capture_button = m_handheld->GetCaptureButtons().capture.Value() ||
+                                m_player1->GetCaptureButtons().capture.Value();

    // Buttons pressed which were not previously pressed
    if (home_button && !m_home_button_press_start) {
@@ -101,7 +90,7 @@ void ButtonPoller::OnButtonStateChanged(WindowSystem& window_system) {
    if (home_button && m_home_button_press_start && !m_home_button_long_sent) {
        const auto duration = ClassifyPressDuration(*m_home_button_press_start);
        if (duration != ButtonPressDuration::ShortPressing) {
-            window_system.OnSystemButtonPress(SystemButtonType::HomeButtonLongPressing);
+            m_window_system.OnSystemButtonPress(SystemButtonType::HomeButtonLongPressing);
            m_home_button_long_sent = true;
        }
     }
@@ -109,7 +98,7 @@ void ButtonPoller::OnButtonStateChanged(WindowSystem& window_system) {
    if (capture_button && m_capture_button_press_start && !m_capture_button_long_sent) {
         const auto duration = ClassifyPressDuration(*m_capture_button_press_start);
         if (duration != ButtonPressDuration::ShortPressing) {
-             window_system.OnSystemButtonPress(SystemButtonType::CaptureButtonLongPressing);
+             m_window_system.OnSystemButtonPress(SystemButtonType::CaptureButtonLongPressing);
             m_capture_button_long_sent = true;
         }
     }
@@ -118,8 +107,9 @@ void ButtonPoller::OnButtonStateChanged(WindowSystem& window_system) {
    if (!home_button && m_home_button_press_start) {
        if(!m_home_button_long_sent) {
            const auto duration = ClassifyPressDuration(*m_home_button_press_start);
-            window_system.OnSystemButtonPress(duration == ButtonPressDuration::ShortPressing
-                ? SystemButtonType::HomeButtonShortPressing : SystemButtonType::HomeButtonLongPressing);
+            m_window_system.OnSystemButtonPress(
+                duration == ButtonPressDuration::ShortPressing ? SystemButtonType::HomeButtonShortPressing
+                                                               : SystemButtonType::HomeButtonLongPressing);
        }
        m_home_button_press_start = std::nullopt;
        m_home_button_long_sent = false;
@@ -127,8 +117,9 @@ void ButtonPoller::OnButtonStateChanged(WindowSystem& window_system) {
    if (!capture_button && m_capture_button_press_start) {
        if (!m_capture_button_long_sent) {
            const auto duration = ClassifyPressDuration(*m_capture_button_press_start);
-            window_system.OnSystemButtonPress(duration == ButtonPressDuration::ShortPressing
-                ? SystemButtonType::CaptureButtonShortPressing : SystemButtonType::CaptureButtonLongPressing);
+            m_window_system.OnSystemButtonPress(
+                duration == ButtonPressDuration::ShortPressing ? SystemButtonType::CaptureButtonShortPressing
+                                                               : SystemButtonType::CaptureButtonLongPressing);
        }
        m_capture_button_press_start = std::nullopt;
        m_capture_button_long_sent = false;
@@ -139,4 +130,16 @@ void ButtonPoller::OnButtonStateChanged(WindowSystem& window_system) {
    // }
 }

+void ButtonPoller::ThreadLoop() {
+    using namespace std::chrono_literals;
+    std::unique_lock lk{m_mutex};
+    while (!m_stop) {
+        m_cv.wait_for(lk, 50ms);
+        if (m_stop) break;
+        lk.unlock();
+        OnButtonStateChanged();
+        lk.lock();
+    }
+}
+
 } // namespace Service::AM
@@ -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 2024 yuzu Emulator Project
@@ -30,23 +30,31 @@ class ButtonPoller {
 public:
    explicit ButtonPoller(Core::System& system, WindowSystem& window_system);
    ~ButtonPoller();
-    void OnButtonStateChanged(WindowSystem& window_system);

 private:
-    std::mutex m_mutex;
-    std::condition_variable m_cv;
-    std::jthread m_thread;
+    void OnButtonStateChanged();
+    void ThreadLoop();
+
+private:
+    WindowSystem& m_window_system;
+
+    Core::HID::EmulatedController* m_handheld{};
+    int m_handheld_key{};
+    Core::HID::EmulatedController* m_player1{};
+    int m_player1_key{};
+
    std::optional<std::chrono::steady_clock::time_point> m_home_button_press_start{};
    std::optional<std::chrono::steady_clock::time_point> m_capture_button_press_start{};
    std::optional<std::chrono::steady_clock::time_point> m_power_button_press_start{};

-    Core::HID::EmulatedController* m_handheld{};
-    Core::HID::EmulatedController* m_player1{};
-    int32_t m_handheld_key{};
-    int32_t m_player1_key{};
-    bool m_home_button_long_sent : 1 = false;
-    bool m_capture_button_long_sent : 1 = false;
-    bool m_power_button_long_sent : 1 = false;
+    bool m_home_button_long_sent{};
+    bool m_capture_button_long_sent{};
+    bool m_power_button_long_sent{};
+
+    std::thread m_thread;
+    std::atomic<bool> m_stop{false};
+    std::condition_variable m_cv;
+    std::mutex m_mutex;
 };

 } // namespace Service::AM
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -18,24 +15,12 @@ enum class UserDataTag : u32 {
 };

 EventObserver::EventObserver(Core::System& system, WindowSystem& window_system)
-    : m_system(system), m_context(system, "am:EventObserver")
-    , m_window_system(window_system)
-    , m_wakeup_event(m_context)
-    , m_wakeup_holder(m_wakeup_event.GetHandle())
-{
+    : m_system(system), m_context(system, "am:EventObserver"), m_window_system(window_system),
+      m_wakeup_event(m_context), m_wakeup_holder(m_wakeup_event.GetHandle()) {
    m_window_system.SetEventObserver(this);
    m_wakeup_holder.SetUserData(static_cast<uintptr_t>(UserDataTag::WakeupEvent));
    m_wakeup_holder.LinkToMultiWait(std::addressof(m_multi_wait));
-    m_thread = std::thread([this] {
-        Common::SetCurrentThreadName("am:EventObserver");
-        while (true) {
-            auto* signaled_holder = this->WaitSignaled();
-            if (!signaled_holder) {
-                break;
-            }
-            this->Process(signaled_holder);
-        }
-    });
+    m_thread = std::thread([&] { this->ThreadFunc(); });
 }

 EventObserver::~EventObserver() {
@@ -161,4 +146,17 @@ void EventObserver::DestroyAppletProcessHolderLocked(ProcessHolder* holder) {
    delete holder;
 }

+void EventObserver::ThreadFunc() {
+    Common::SetCurrentThreadName("am:EventObserver");
+
+    while (true) {
+        auto* signaled_holder = this->WaitSignaled();
+        if (!signaled_holder) {
+            break;
+        }
+
+        this->Process(signaled_holder);
+    }
+}
+
 } // namespace Service::AM
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -44,6 +41,9 @@ private:
 private:
    void DestroyAppletProcessHolderLocked(ProcessHolder* holder);

+private:
+    void ThreadFunc();
+
 private:
    // System reference and context.
    Core::System& m_system;
@@ -1,10 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <optional>
 #include "core/core.h"
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/nca_metadata.h"
@@ -20,7 +16,7 @@ namespace Service::AM {

 namespace {

-[[nodiscard]] FileSys::StorageId GetStorageIdForFrontendSlot(
+FileSys::StorageId GetStorageIdForFrontendSlot(
    std::optional<FileSys::ContentProviderUnionSlot> slot) {
    if (!slot.has_value()) {
        return FileSys::StorageId::None;
@@ -40,23 +36,31 @@ namespace {
    }
 }

-[[nodiscard]] inline std::optional<Process> CreateProcessImpl(std::unique_ptr<Loader::AppLoader>& out_loader, Loader::ResultStatus& out_load_result, Core::System& system, FileSys::VirtualFile file, u64 program_id, u64 program_index) {
+std::unique_ptr<Process> CreateProcessImpl(std::unique_ptr<Loader::AppLoader>& out_loader,
+                                           Loader::ResultStatus& out_load_result,
+                                           Core::System& system, FileSys::VirtualFile file,
+                                           u64 program_id, u64 program_index) {
    // Get the appropriate loader to parse this NCA.
    out_loader = Loader::GetLoader(system, file, program_id, program_index);
+
    // Ensure we have a loader which can parse the NCA.
-    if (out_loader) {
-        // Try to load the process.
-        auto process = std::make_optional<Process>(system);
-        if (process->Initialize(*out_loader, out_load_result)) {
-            return process;
-        }
+    if (!out_loader) {
+        return nullptr;
    }
-    return std::nullopt;
+
+    // Try to load the process.
+    auto process = std::make_unique<Process>(system);
+    if (process->Initialize(*out_loader, out_load_result)) {
+        return process;
+    }
+
+    return nullptr;
 }

 } // Anonymous namespace

-std::optional<Process> CreateProcess(Core::System& system, u64 program_id, u8 minimum_key_generation, u8 maximum_key_generation) {
+std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
+                                       u8 minimum_key_generation, u8 maximum_key_generation) {
    // Attempt to load program NCA.
    FileSys::VirtualFile nca_raw{};

@@ -66,7 +70,7 @@ std::optional<Process> CreateProcess(Core::System& system, u64 program_id, u8 mi

    // Ensure we retrieved a program NCA.
    if (!nca_raw) {
-        return std::nullopt;
+        return nullptr;
    }

    // Ensure we have a suitable version.
@@ -75,8 +79,9 @@ std::optional<Process> CreateProcess(Core::System& system, u64 program_id, u8 mi
        if (nca.GetStatus() == Loader::ResultStatus::Success &&
            (nca.GetKeyGeneration() < minimum_key_generation ||
             nca.GetKeyGeneration() > maximum_key_generation)) {
-            LOG_WARNING(Service_LDR, "Skipping program {:016X} with generation {}", program_id, nca.GetKeyGeneration());
-            return std::nullopt;
+            LOG_WARNING(Service_LDR, "Skipping program {:016X} with generation {}", program_id,
+                        nca.GetKeyGeneration());
+            return nullptr;
        }
    }

@@ -85,32 +90,42 @@ std::optional<Process> CreateProcess(Core::System& system, u64 program_id, u8 mi
    return CreateProcessImpl(loader, status, system, nca_raw, program_id, 0);
 }

-std::optional<Process> CreateApplicationProcess(std::vector<u8>& out_control, std::unique_ptr<Loader::AppLoader>& out_loader, Loader::ResultStatus& out_load_result, Core::System& system, FileSys::VirtualFile file, u64 program_id, u64 program_index) {
-    if (auto process = CreateProcessImpl(out_loader, out_load_result, system, file, program_id, program_index); process) {
-        FileSys::NACP nacp;
-        if (out_loader->ReadControlData(nacp) == Loader::ResultStatus::Success) {
-            out_control = nacp.GetRawBytes();
-        } else {
-            out_control.resize(sizeof(FileSys::RawNACP));
-            std::fill(out_control.begin(), out_control.end(), (u8) 0);
-        }
-
-        auto& storage = system.GetContentProviderUnion();
-        Service::Glue::ApplicationLaunchProperty launch{};
-        launch.title_id = process->GetProgramId();
-
-        FileSys::PatchManager pm{launch.title_id, system.GetFileSystemController(), storage};
-        launch.version = pm.GetGameVersion().value_or(0);
-
-        // TODO(DarkLordZach): When FSController/Game Card Support is added, if
-        // current_process_game_card use correct StorageId
-        launch.base_game_storage_id = GetStorageIdForFrontendSlot(storage.GetSlotForEntry(launch.title_id, FileSys::ContentRecordType::Program));
-        launch.update_storage_id = GetStorageIdForFrontendSlot(storage.GetSlotForEntry(FileSys::GetUpdateTitleID(launch.title_id), FileSys::ContentRecordType::Program));
-
-        system.GetARPManager().Register(launch.title_id, launch, out_control);
-        return process;
+std::unique_ptr<Process> CreateApplicationProcess(std::vector<u8>& out_control,
+                                                  std::unique_ptr<Loader::AppLoader>& out_loader,
+                                                  Loader::ResultStatus& out_load_result,
+                                                  Core::System& system, FileSys::VirtualFile file,
+                                                  u64 program_id, u64 program_index) {
+    auto process =
+        CreateProcessImpl(out_loader, out_load_result, system, file, program_id, program_index);
+    if (!process) {
+        return nullptr;
    }
-    return std::nullopt;
+
+    FileSys::NACP nacp;
+    if (out_loader->ReadControlData(nacp) == Loader::ResultStatus::Success) {
+        out_control = nacp.GetRawBytes();
+    } else {
+        out_control.resize(sizeof(FileSys::RawNACP));
+        std::fill(out_control.begin(), out_control.end(), (u8) 0);
+    }
+
+    auto& storage = system.GetContentProviderUnion();
+    Service::Glue::ApplicationLaunchProperty launch{};
+    launch.title_id = process->GetProgramId();
+
+    FileSys::PatchManager pm{launch.title_id, system.GetFileSystemController(), storage};
+    launch.version = pm.GetGameVersion().value_or(0);
+
+    // TODO(DarkLordZach): When FSController/Game Card Support is added, if
+    // current_process_game_card use correct StorageId
+    launch.base_game_storage_id = GetStorageIdForFrontendSlot(
+        storage.GetSlotForEntry(launch.title_id, FileSys::ContentRecordType::Program));
+    launch.update_storage_id = GetStorageIdForFrontendSlot(storage.GetSlotForEntry(
+        FileSys::GetUpdateTitleID(launch.title_id), FileSys::ContentRecordType::Program));
+
+    system.GetARPManager().Register(launch.title_id, launch, out_control);
+
+    return process;
 }

 } // namespace Service::AM
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -27,7 +24,12 @@ class Process;

 namespace Service::AM {

-std::optional<Process> CreateProcess(Core::System& system, u64 program_id, u8 minimum_key_generation, u8 maximum_key_generation);
-std::optional<Process> CreateApplicationProcess(std::vector<u8>& out_control, std::unique_ptr<Loader::AppLoader>& out_loader, Loader::ResultStatus& out_load_result, Core::System& system, FileSys::VirtualFile file, u64 program_id, u64 program_index);
+std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
+                                       u8 minimum_key_generation, u8 maximum_key_generation);
+std::unique_ptr<Process> CreateApplicationProcess(std::vector<u8>& out_control,
+                                                  std::unique_ptr<Loader::AppLoader>& out_loader,
+                                                  Loader::ResultStatus& out_load_result,
+                                                  Core::System& system, FileSys::VirtualFile file,
+                                                  u64 program_id, u64 program_index);

 } // namespace Service::AM
@@ -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 2024 yuzu Emulator Project
@@ -21,7 +21,8 @@ namespace Service::AM {

 namespace {

-Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_application_accessor, Core::System& system, WindowSystem& window_system, u64 program_id) {
+Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_application_accessor,
+                              Core::System& system, WindowSystem& window_system, u64 program_id) {
    FileSys::VirtualFile nca_raw{};

    // Get the program NCA from storage.
@@ -34,10 +35,11 @@ Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_applicati
    std::vector<u8> control;
    std::unique_ptr<Loader::AppLoader> loader;
    Loader::ResultStatus result;
-    auto process = CreateApplicationProcess(control, loader, result, system, nca_raw, program_id, 0);
-    R_UNLESS(process != std::nullopt, ResultUnknown);
+    auto process =
+        CreateApplicationProcess(control, loader, result, system, nca_raw, program_id, 0);
+    R_UNLESS(process != nullptr, ResultUnknown);

-    const auto applet = std::make_shared<Applet>(system, std::make_unique<Service::Process>(*std::move(process)), true);
+    const auto applet = std::make_shared<Applet>(system, std::move(process), true);
    applet->program_id = program_id;
    applet->applet_id = AppletId::Application;
    applet->type = AppletType::Application;
@@ -45,7 +47,8 @@ Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_applicati

    window_system.TrackApplet(applet, true);

-    *out_application_accessor = std::make_shared<IApplicationAccessor>(system, applet, window_system);
+    *out_application_accessor =
+        std::make_shared<IApplicationAccessor>(system, applet, window_system);
    R_SUCCEED();
 }

@@ -87,10 +90,12 @@ Result IApplicationCreator::CreateSystemApplication(

    std::vector<u8> control;
    std::unique_ptr<Loader::AppLoader> loader;
-    auto process = CreateProcess(system, application_id, 1, 21);
-    R_UNLESS(process != std::nullopt, ResultUnknown);

-    const auto applet = std::make_shared<Applet>(system, std::make_unique<Service::Process>(*std::move(process)), true);
+    auto process =
+        CreateProcess(system, application_id, 1, 21);
+    R_UNLESS(process != nullptr, ResultUnknown);
+
+    const auto applet = std::make_shared<Applet>(system, std::move(process), true);
    applet->program_id = application_id;
    applet->applet_id = AppletId::Starter;
    applet->type = AppletType::LibraryApplet;
@@ -98,7 +103,8 @@ Result IApplicationCreator::CreateSystemApplication(

    m_window_system.TrackApplet(applet, true);

-    *out_application_accessor = std::make_shared<IApplicationAccessor>(system, applet, m_window_system);
+    *out_application_accessor =
+        std::make_shared<IApplicationAccessor>(system, applet, m_window_system);
    Core::LaunchTimestampCache::SaveLaunchTimestamp(application_id);
    R_SUCCEED();
 }
@@ -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 2024 yuzu Emulator Project
@@ -121,23 +121,26 @@ std::shared_ptr<ILibraryAppletAccessor> CreateGuestApplet(Core::System& system,
    };

    auto process = CreateProcess(system, program_id, Firmware1400, Firmware2100);
-    if (process) {
-        const auto applet = std::make_shared<Applet>(system, std::make_unique<Service::Process>(*std::move(process)), false);
-        applet->program_id = program_id;
-        applet->applet_id = applet_id;
-        applet->type = AppletType::LibraryApplet;
-        applet->library_applet_mode = mode;
-        applet->window_visible = mode != LibraryAppletMode::AllForegroundInitiallyHidden;
-
-        auto broker = std::make_shared<AppletDataBroker>(system);
-        applet->caller_applet = caller_applet;
-        applet->caller_applet_broker = broker;
-        caller_applet->child_applets.push_back(applet);
-        window_system.TrackApplet(applet, false);
-        return std::make_shared<ILibraryAppletAccessor>(system, broker, applet);
+    if (!process) {
+        // Couldn't initialize the guest process
+        return {};
    }
-    // Couldn't initialize the guest process
-    return {};
+
+    const auto applet = std::make_shared<Applet>(system, std::move(process), false);
+    applet->program_id = program_id;
+    applet->applet_id = applet_id;
+    applet->type = AppletType::LibraryApplet;
+    applet->library_applet_mode = mode;
+    applet->window_visible = mode != LibraryAppletMode::AllForegroundInitiallyHidden;
+
+    auto broker = std::make_shared<AppletDataBroker>(system);
+    applet->caller_applet = caller_applet;
+    applet->caller_applet_broker = broker;
+    caller_applet->child_applets.push_back(applet);
+
+    window_system.TrackApplet(applet, false);
+
+    return std::make_shared<ILibraryAppletAccessor>(system, broker, applet);
 }

 std::shared_ptr<ILibraryAppletAccessor> CreateFrontendApplet(Core::System& system,
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -14,9 +14,7 @@ namespace Service::Audio {
 using namespace AudioCore::AudioOut;

 IAudioOutManager::IAudioOutManager(Core::System& system_)
-    : ServiceFramework{system_, "audout:u"}
-    , impl(system_)
-{
+    : ServiceFramework{system_, "audout:u"}, impl{std::make_unique<Manager>(system_)} {
    // clang-format off
    static const FunctionInfo functions[] = {
        {0, D<&IAudioOutManager::ListAudioOuts>, "ListAudioOuts"},
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -43,7 +43,7 @@ private:
        AudioCore::AudioOut::AudioOutParameter parameter,
        InCopyHandle<Kernel::KProcess> process_handle, ClientAppletResourceUserId aruid);

-    std::optional<AudioCore::AudioOut::Manager> impl;
+    std::unique_ptr<AudioCore::AudioOut::Manager> impl;
 };

 } // namespace Service::Audio
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -18,9 +15,7 @@ namespace Service::Audio {
 using namespace AudioCore::Renderer;

 IAudioRendererManager::IAudioRendererManager(Core::System& system_)
-    : ServiceFramework{system_, "audren:u"}
-    , impl(system_)
-{
+    : ServiceFramework{system_, "audren:u"}, impl{std::make_unique<Manager>(system_)} {
    // clang-format off
    static const FunctionInfo functions[] = {
        {0, D<&IAudioRendererManager::OpenAudioRenderer>, "OpenAudioRenderer"},
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -33,7 +30,7 @@ private:
    Result GetAudioDeviceServiceWithRevisionInfo(Out<SharedPointer<IAudioDevice>> out_audio_device,
                                                 u32 revision, ClientAppletResourceUserId aruid);

-    std::optional<AudioCore::Renderer::Manager> impl;
+    std::unique_ptr<AudioCore::Renderer::Manager> impl;
    u32 num_audio_devices{0};
 };

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -13,6 +10,14 @@

 namespace Service {

+Process::Process(Core::System& system)
+    : m_system(system), m_process(), m_main_thread_priority(), m_main_thread_stack_size(),
+      m_process_started() {}
+
+Process::~Process() {
+    this->Finalize();
+}
+
 bool Process::Initialize(Loader::AppLoader& loader, Loader::ResultStatus& out_load_result) {
    // First, ensure we are not holding another process.
    this->Finalize();
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -25,8 +22,8 @@ namespace Service {

 class Process {
 public:
-    inline explicit Process(Core::System& system) noexcept : m_system(system) {}
-    inline ~Process() { this->Finalize(); }
+    explicit Process(Core::System& system);
+    ~Process();

    bool Initialize(Loader::AppLoader& loader, Loader::ResultStatus& out_load_result);
    void Finalize();
@@ -53,8 +50,8 @@ public:
 private:
    Core::System& m_system;
    Kernel::KProcess* m_process{};
-    u64 m_main_thread_stack_size{};
    s32 m_main_thread_priority{};
+    u64 m_main_thread_stack_size{};
    bool m_process_started{};
 };

@@ -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 2023 yuzu Emulator Project
@@ -373,8 +373,6 @@ Result SharedBufferManager::PresentSharedFrameBuffer(android::Fence fence,
                 android::Status::NoError,
             VI::ResultOperationFailed);

-    (void)m_container.SetLayerZIndex(layer_id, 100000);
-
    // We succeeded.
    R_SUCCEED();
 }
@@ -78,9 +78,7 @@ if (MSVC)
        /Zc:throwingNew     # Assumes new (without std::nothrow) never returns null.
        /volatile:iso       # Use strict standard-abiding volatile semantics
        /bigobj             # Increase number of sections in .obj files
-        /DNOMINMAX
-        /GR-
-    )
+        /DNOMINMAX)

    if (CXX_CLANG)
        list(APPEND DYNARMIC_CXX_FLAGS
@@ -93,10 +91,8 @@ else()
        -Wextra
        -Wcast-qual
        -pedantic
-        -Wno-missing-braces
-        -fno-rtti
-        #-fno-exceptions
-    )
+        -Wno-missing-braces)
+
    if (CXX_GCC)
        # GCC produces bogus -Warray-bounds warnings from xbyak headers for code paths that are not
        # actually reachable.  Specifically, it happens in cases where some code casts an Operand&
@@ -106,6 +102,7 @@ else()
        list(APPEND DYNARMIC_CXX_FLAGS -Wno-array-bounds)
        list(APPEND DYNARMIC_CXX_FLAGS -Wstack-usage=4096)
    endif()
+
    if (CXX_CLANG)
        # Bracket depth determines maximum size of a fold expression in Clang since 9c9974c3ccb6.
        # And this in turns limits the size of a std::array.
@@ -120,6 +117,7 @@ if (NOT Boost_FOUND)
 endif()

 find_package(fmt 8 CONFIG)
+find_package(mcl 0.1.12 REQUIRED)
 find_package(unordered_dense REQUIRED)

 if ("arm64" IN_LIST ARCHITECTURE OR DYNARMIC_TESTS)
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 string(TOUPPER "${arch}" arch)
 file(READ "${input_file}" f_contents)
-file(WRITE "${output_file}" "#if defined(ARCHITECTURE_${arch})\n${f_contents}\n#endif\n")
+file(WRITE "${output_file}" "#include <mcl/macro/architecture.hpp>\n#if defined(MCL_ARCHITECTURE_${arch})\n${f_contents}\n#endif\n")
@@ -3,12 +3,6 @@
 include(TargetArchitectureSpecificSources)

 add_library(dynarmic STATIC
-    mcl/bit.hpp
-    mcl/function_info.hpp
-    mcl/integer_of_size.hpp
-    mcl/intrusive_list.hpp
-    mcl/is_instance_of_template.hpp
-
    backend/block_range_information.cpp
    backend/block_range_information.h
    backend/exception_handler.h
@@ -359,7 +353,7 @@ set_target_properties(dynarmic PROPERTIES
 target_compile_options(dynarmic PRIVATE ${DYNARMIC_CXX_FLAGS})

 target_link_libraries(dynarmic PRIVATE unordered_dense::unordered_dense)
-target_link_libraries(dynarmic PUBLIC fmt::fmt)
+target_link_libraries(dynarmic PUBLIC fmt::fmt merry::mcl)

 if (BOOST_NO_HEADERS)
    target_link_libraries(dynarmic PRIVATE Boost::variant Boost::icl Boost::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

 /* This file is part of the dynarmic project.
@@ -11,6 +11,7 @@

 #include <boost/icl/interval_set.hpp>
 #include "dynarmic/common/assert.h"
+#include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/backend/arm64/a32_address_space.h"
@@ -35,9 +36,14 @@ struct Jit::Impl final {
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&halt_reason)));

        jit_interface->is_executing = true;
+        SCOPE_EXIT {
+            jit_interface->is_executing = false;
+        };
+
        HaltReason hr = core.Run(current_address_space, current_state, &halt_reason);
+
        PerformRequestedCacheInvalidation(hr);
-        jit_interface->is_executing = false;
+
        return hr;
    }

@@ -46,9 +52,14 @@ struct Jit::Impl final {
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&halt_reason)));

        jit_interface->is_executing = true;
+        SCOPE_EXIT {
+            jit_interface->is_executing = false;
+        };
+
        HaltReason hr = core.Step(current_address_space, current_state, &halt_reason);
+
        PerformRequestedCacheInvalidation(hr);
-        jit_interface->is_executing = false;
+
        return hr;
    }

@@ -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

 /* This file is part of the dynarmic project.
@@ -8,7 +8,7 @@

 #include "dynarmic/backend/arm64/a32_jitstate.h"

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"

 namespace Dynarmic::Backend::Arm64 {
@@ -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

 /* This file is part of the dynarmic project.
@@ -11,6 +11,7 @@

 #include <boost/icl/interval_set.hpp>
 #include "dynarmic/common/assert.h"
+#include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/backend/arm64/a64_address_space.h"
@@ -33,20 +34,32 @@ struct Jit::Impl final {
    HaltReason Run() {
        ASSERT(!is_executing);
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&halt_reason)));
+
        is_executing = true;
+        SCOPE_EXIT {
+            is_executing = false;
+        };
+
        HaltReason hr = core.Run(current_address_space, current_state, &halt_reason);
+
        PerformRequestedCacheInvalidation(hr);
-        is_executing = false;
+
        return hr;
    }

    HaltReason Step() {
        ASSERT(!is_executing);
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&halt_reason)));
+
        is_executing = true;
+        SCOPE_EXIT {
+            is_executing = false;
+        };
+
        HaltReason hr = core.Step(current_address_space, current_state, &halt_reason);
+
        PerformRequestedCacheInvalidation(hr);
-        is_executing = false;
+
        return hr;
    }

@@ -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

 /* This file is part of the dynarmic project.
@@ -10,7 +10,7 @@

 #include <vector>

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"
 #include <oaknut/oaknut.hpp>

@@ -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

 /* This file is part of the dynarmic project.
@@ -12,6 +12,7 @@
 #include <stdexcept>
 #include <type_traits>

+#include <mcl/mp/metavalue/lift_value.hpp>
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/common/assert.h"
 #include <oaknut/oaknut.hpp>
@@ -36,7 +37,7 @@ constexpr auto Rscratch0() {
    } else if constexpr (bitsize == 64) {
        return Xscratch0;
    } else {
-        return Xscratch0; //UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<bitsize>>);
    }
 }

@@ -47,7 +48,7 @@ constexpr auto Rscratch1() {
    } else if constexpr (bitsize == 64) {
        return Xscratch1;
    } else {
-        return Xscratch1; //UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<bitsize>>);
    }
 }

@@ -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

 /* This file is part of the dynarmic project.
@@ -10,7 +10,7 @@

 #include <bit>
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/function_info.hpp"
+#include <mcl/type_traits/function_info.hpp>

 namespace Dynarmic::Backend::Arm64 {

@@ -6,7 +6,7 @@
 * SPDX-License-Identifier: 0BSD
 */

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include <oaknut/oaknut.hpp>

 #include "dynarmic/backend/arm64/a32_jitstate.h"
@@ -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

 /* This file is part of the dynarmic project.
@@ -642,7 +642,7 @@ void EmitIR<IR::Opcode::ArithmeticShiftRight64>(oaknut::CodeGenerator& code, Emi
 }

 template<>
-void EmitIR<IR::Opcode::BitRotateRight32>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
+void EmitIR<IR::Opcode::RotateRight32>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
    const auto carry_inst = inst->GetAssociatedPseudoOperation(IR::Opcode::GetCarryFromOp);

    auto args = ctx.reg_alloc.GetArgumentInfo(inst);
@@ -708,7 +708,7 @@ void EmitIR<IR::Opcode::BitRotateRight32>(oaknut::CodeGenerator& code, EmitConte
 }

 template<>
-void EmitIR<IR::Opcode::BitRotateRight64>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
+void EmitIR<IR::Opcode::RotateRight64>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
    auto args = ctx.reg_alloc.GetArgumentInfo(inst);
    auto& operand_arg = args[0];
    auto& shift_arg = args[1];
@@ -209,9 +209,9 @@ void CallbackOnlyEmitExclusiveWriteMemory(oaknut::CodeGenerator& code, EmitConte
    ctx.reg_alloc.DefineAsRegister(inst, X0);
 }

-constexpr size_t page_table_const_bits = 12;
-constexpr size_t page_table_const_size = 1 << page_table_const_bits;
-constexpr size_t page_table_const_mask = (1 << page_table_const_bits) - 1;
+constexpr size_t page_bits = 12;
+constexpr size_t page_size = 1 << page_bits;
+constexpr size_t page_mask = (1 << page_bits) - 1;

 // This function may use Xscratch0 as a scratch register
 // Trashes NZCV
@@ -242,28 +242,28 @@ void EmitDetectMisalignedVAddr(oaknut::CodeGenerator& code, EmitContext& ctx, oa
        code.TST(Xaddr, align_mask);
        code.B(NE, *fallback);
    } else {
-        // If (addr & page_table_const_mask) > page_table_const_size - byte_size, use fallback.
-        code.AND(Xscratch0, Xaddr, page_table_const_mask);
-        code.CMP(Xscratch0, page_table_const_size - bitsize / 8);
+        // If (addr & page_mask) > page_size - byte_size, use fallback.
+        code.AND(Xscratch0, Xaddr, page_mask);
+        code.CMP(Xscratch0, page_size - bitsize / 8);
        code.B(HI, *fallback);
    }
 }

-// Outputs Xscratch0 = page_table[addr >> page_table_const_bits]
+// Outputs Xscratch0 = page_table[addr >> page_bits]
 // May use Xscratch1 as scratch register
 // Address to read/write = [ret0 + ret1], ret0 is always Xscratch0 and ret1 is either Xaddr or Xscratch1
 // Trashes NZCV
 template<size_t bitsize>
 std::pair<oaknut::XReg, oaknut::XReg> InlinePageTableEmitVAddrLookup(oaknut::CodeGenerator& code, EmitContext& ctx, oaknut::XReg Xaddr, const SharedLabel& fallback) {
-    const size_t valid_page_index_bits = ctx.conf.page_table_address_space_bits - page_table_const_bits;
+    const size_t valid_page_index_bits = ctx.conf.page_table_address_space_bits - page_bits;
    const size_t unused_top_bits = 64 - ctx.conf.page_table_address_space_bits;

    EmitDetectMisalignedVAddr<bitsize>(code, ctx, Xaddr, fallback);

    if (ctx.conf.silently_mirror_page_table || unused_top_bits == 0) {
-        code.UBFX(Xscratch0, Xaddr, page_table_const_bits, valid_page_index_bits);
+        code.UBFX(Xscratch0, Xaddr, page_bits, valid_page_index_bits);
    } else {
-        code.LSR(Xscratch0, Xaddr, page_table_const_bits);
+        code.LSR(Xscratch0, Xaddr, page_bits);
        code.TST(Xscratch0, u64(~u64(0)) << valid_page_index_bits);
        code.B(NE, *fallback);
    }
@@ -283,7 +283,7 @@ std::pair<oaknut::XReg, oaknut::XReg> InlinePageTableEmitVAddrLookup(oaknut::Cod
    if (ctx.conf.absolute_offset_page_table) {
        return std::make_pair(Xscratch0, Xaddr);
    }
-    code.AND(Xscratch1, Xaddr, page_table_const_mask);
+    code.AND(Xscratch1, Xaddr, page_mask);
    return std::make_pair(Xscratch0, Xscratch1);
 }

@@ -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

 /* This file is part of the dynarmic project.
@@ -6,6 +6,7 @@
 * SPDX-License-Identifier: 0BSD
 */

+#include <mcl/mp/metavalue/lift_value.hpp>
 #include <oaknut/oaknut.hpp>

 #include "dynarmic/backend/arm64/a32_jitstate.h"
@@ -45,7 +46,7 @@ static void EmitTwoOpArranged(oaknut::CodeGenerator& code, EmitContext& ctx, IR:
        } else if constexpr (size == 64) {
            emit(Qresult->D2(), Qoperand->D2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -68,7 +69,7 @@ static void EmitTwoOpArrangedWiden(oaknut::CodeGenerator& code, EmitContext& ctx
        } else if constexpr (size == 32) {
            emit(Qresult->D2(), Qoperand->toD().S2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -83,7 +84,7 @@ static void EmitTwoOpArrangedNarrow(oaknut::CodeGenerator& code, EmitContext& ct
        } else if constexpr (size == 64) {
            emit(Qresult->toD().S2(), Qoperand->D2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -106,7 +107,7 @@ static void EmitTwoOpArrangedPairWiden(oaknut::CodeGenerator& code, EmitContext&
        } else if constexpr (size == 32) {
            emit(Qresult->D2(), Qoperand->S4());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -121,7 +122,7 @@ static void EmitTwoOpArrangedLower(oaknut::CodeGenerator& code, EmitContext& ctx
        } else if constexpr (size == 32) {
            emit(Qresult->toD().S2(), Qoperand->toD().S2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -149,7 +150,7 @@ static void EmitThreeOpArranged(oaknut::CodeGenerator& code, EmitContext& ctx, I
        } else if constexpr (size == 64) {
            emit(Qresult->D2(), Qa->D2(), Qb->D2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -174,7 +175,7 @@ static void EmitThreeOpArrangedWiden(oaknut::CodeGenerator& code, EmitContext& c
        } else if constexpr (size == 64) {
            emit(Qresult->Q1(), Qa->toD().D1(), Qb->toD().D1());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -197,7 +198,7 @@ static void EmitThreeOpArrangedLower(oaknut::CodeGenerator& code, EmitContext& c
        } else if constexpr (size == 32) {
            emit(Qresult->toD().S2(), Qa->toD().S2(), Qb->toD().S2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -219,7 +220,7 @@ static void EmitSaturatedAccumulate(oaknut::CodeGenerator&, EmitContext& ctx, IR
    } else if constexpr (size == 64) {
        emit(Qaccumulator->D2(), Qoperand->D2());
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
    }
 }

@@ -240,7 +241,7 @@ static void EmitImmShift(oaknut::CodeGenerator&, EmitContext& ctx, IR::Inst* ins
    } else if constexpr (size == 64) {
        emit(Qresult->D2(), Qoperand->D2(), shift_amount);
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
    }
 }

@@ -268,7 +269,7 @@ static void EmitReduce(oaknut::CodeGenerator&, EmitContext& ctx, IR::Inst* inst,
    } else if constexpr (size == 64) {
        emit(Vresult, Qoperand->D2());
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
    }
 }

@@ -7,8 +7,14 @@
 */

 #include <bit>
-#include "dynarmic/mcl/function_info.hpp"
-#include "dynarmic/mcl/integer_of_size.hpp"
+#include <mcl/mp/metavalue/lift_value.hpp>
+#include <mcl/mp/typelist/cartesian_product.hpp>
+#include <mcl/mp/typelist/get.hpp>
+#include <mcl/mp/typelist/lift_sequence.hpp>
+#include <mcl/mp/typelist/list.hpp>
+#include <mcl/mp/typelist/lower_to_tuple.hpp>
+#include <mcl/type_traits/function_info.hpp>
+#include <mcl/type_traits/integer_of_size.hpp>
 #include <oaknut/oaknut.hpp>

 #include "dynarmic/backend/arm64/a32_jitstate.h"
@@ -32,6 +38,8 @@
 namespace Dynarmic::Backend::Arm64 {

 using namespace oaknut::util;
+namespace mp = mcl::mp;
+
 using A64FullVectorWidth = std::integral_constant<size_t, 128>;

 // Array alias that always sizes itself according to the given type T
@@ -75,7 +83,7 @@ static void EmitTwoOpArranged(oaknut::CodeGenerator& code, EmitContext& ctx, IR:
        } else if constexpr (size == 64) {
            emit(Qresult->D2(), Qa->D2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -103,7 +111,7 @@ static void EmitThreeOpArranged(oaknut::CodeGenerator& code, EmitContext& ctx, I
        } else if constexpr (size == 64) {
            emit(Qresult->D2(), Qa->D2(), Qb->D2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -126,7 +134,7 @@ static void EmitFMA(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* ins
        } else if constexpr (size == 64) {
            emit(Qresult->D2(), Qm->D2(), Qn->D2());
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -148,7 +156,7 @@ static void EmitFromFixed(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Ins
        } else if constexpr (size == 64) {
            emit(Qto->D2(), Qfrom->D2(), fbits);
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
        }
    });
 }
@@ -170,7 +178,7 @@ void EmitToFixed(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst)
        } else if constexpr (fsize == 64) {
            return Qto->D2();
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<fsize>>);
        }
    }();
    auto Vfrom = [&] {
@@ -179,7 +187,7 @@ void EmitToFixed(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst)
        } else if constexpr (fsize == 64) {
            return Qfrom->D2();
        } else {
-            UNREACHABLE();
+            static_assert(Common::always_false_v<mcl::mp::lift_value<fsize>>);
        }
    }();

@@ -1,11 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2022 MerryMage
 * SPDX-License-Identifier: 0BSD
 */

+#include <mcl/mp/metavalue/lift_value.hpp>
 #include <oaknut/oaknut.hpp>

 #include "dynarmic/backend/arm64/a32_jitstate.h"
@@ -41,7 +39,7 @@ static void Emit(oaknut::CodeGenerator&, EmitContext& ctx, IR::Inst* inst, EmitF
    } else if constexpr (size == 64) {
        emit(Qresult->D2(), Qa->D2(), Qb->D2());
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<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

 /* This file is part of the dynarmic project.
@@ -10,10 +10,11 @@

 #include <cstddef>
 #include <tuple>
+
+#include <mcl/hash/xmrx.hpp>
+#include "dynarmic/common/common_types.h"
 #include <ankerl/unordered_dense.h>

-#include "dynarmic/mcl/bit.hpp"
-#include "dynarmic/common/common_types.h"
 #include "dynarmic/backend/exception_handler.h"
 #include "dynarmic/ir/location_descriptor.h"

@@ -21,16 +22,9 @@ namespace Dynarmic::Backend::Arm64 {

 using DoNotFastmemMarker = std::tuple<IR::LocationDescriptor, unsigned>;

-constexpr size_t xmrx(size_t x) noexcept {
-    x ^= x >> 32;
-    x *= 0xff51afd7ed558ccd;
-    x ^= mcl::bit::rotate_right(x, 47) ^ mcl::bit::rotate_right(x, 23);
-    return x;
-}
-
 struct DoNotFastmemMarkerHash {
-    [[nodiscard]] size_t operator()(const DoNotFastmemMarker& value) const noexcept {
-        return xmrx(std::get<0>(value).Value() ^ u64(std::get<1>(value)));
+    size_t operator()(const DoNotFastmemMarker& value) const {
+        return mcl::hash::xmrx(std::get<0>(value).Value() ^ static_cast<u64>(std::get<1>(value)));
    }
 };

@@ -13,8 +13,9 @@
 #include <iterator>

 #include "dynarmic/common/assert.h"
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include <bit>
+#include <mcl/mp/metavalue/lift_value.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/backend/arm64/abi.h"
@@ -298,7 +299,7 @@ int RegAlloc::GenerateImmediate(const IR::Value& value) {

        return 0;
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<kind>>);
    }
 }

@@ -365,7 +366,7 @@ int RegAlloc::RealizeReadImpl(const IR::Value& value) {
    } else if constexpr (required_kind == HostLoc::Kind::Flags) {
        UNREACHABLE(); //A simple read from flags is likely a logic error
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<required_kind>>);
    }
 }

@@ -389,7 +390,7 @@ int RegAlloc::RealizeWriteImpl(const IR::Inst* value) {
        flags.SetupLocation(value);
        return 0;
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<kind>>);
    }
 }

@@ -409,7 +410,7 @@ int RegAlloc::RealizeReadWriteImpl(const IR::Value& read_value, const IR::Inst*
    } else if constexpr (kind == HostLoc::Kind::Flags) {
        ASSERT(false && "Incorrect function for ReadWrite of flags");
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<kind>>);
    }
 }

@@ -16,7 +16,7 @@

 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/is_instance_of_template.hpp"
+#include <mcl/type_traits/is_instance_of_template.hpp>
 #include <oaknut/oaknut.hpp>
 #include <ankerl/unordered_dense.h>

@@ -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

 /* This file is part of the dynarmic project.
@@ -12,6 +12,7 @@
 #include <memory>
 #include <optional>

+#include <mcl/macro/architecture.hpp>
 #include "dynarmic/common/common_types.h"

 #if defined(ARCHITECTURE_x86_64)
@@ -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

 /* This file is part of the dynarmic project.
@@ -16,10 +16,11 @@
 #include <optional>
 #include <thread>
 #include <vector>
-#include <bit>

 #include <fmt/format.h>
 #include "dynarmic/common/assert.h"
+#include <bit>
+#include <mcl/macro/architecture.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/backend/exception_handler.h"
@@ -3,6 +3,8 @@
 * SPDX-License-Identifier: 0BSD
 */

+#include <mcl/macro/architecture.hpp>
+
 #if defined(ARCHITECTURE_x86_64)
 #    include "dynarmic/backend/x64/mig/mach_exc_server.c"
 #elif defined(ARCHITECTURE_arm64)
@@ -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

 /* This file is part of the dynarmic project.
@@ -6,6 +6,8 @@
 * SPDX-License-Identifier: 0BSD
 */

+#include <mcl/macro/architecture.hpp>
+
 #if defined(ARCHITECTURE_x86_64)
 #    include "dynarmic/backend/x64/exception_handler_windows.cpp"
 #elif defined(ARCHITECTURE_arm64)
@@ -99,7 +99,7 @@ void A32AddressSpace::SetCursorPtr(CodePtr ptr) {
 }

 size_t A32AddressSpace::GetRemainingSize() {
-    return conf.code_cache_size - (GetCursorPtr<std::intptr_t>() - GetMemPtr<std::intptr_t>());
+    return conf.code_cache_size - (GetCursorPtr<sptr>() - GetMemPtr<sptr>());
 }

 EmittedBlockInfo A32AddressSpace::Emit(IR::Block block) {
@@ -41,25 +41,25 @@ private:

    template<typename T>
    T GetMemPtr() {
-        static_assert(std::is_pointer_v<T> || std::is_same_v<T, std::uintptr_t> || std::is_same_v<T, std::intptr_t>);
+        static_assert(std::is_pointer_v<T> || std::is_same_v<T, uptr> || std::is_same_v<T, sptr>);
        return reinterpret_cast<T>(as.GetBufferPointer(0));
    }

    template<typename T>
    T GetMemPtr() const {
-        static_assert(std::is_pointer_v<T> || std::is_same_v<T, std::uintptr_t> || std::is_same_v<T, std::intptr_t>);
+        static_assert(std::is_pointer_v<T> || std::is_same_v<T, uptr> || std::is_same_v<T, sptr>);
        return reinterpret_cast<const T>(as.GetBufferPointer(0));
    }

    template<typename T>
    T GetCursorPtr() {
-        static_assert(std::is_pointer_v<T> || std::is_same_v<T, std::uintptr_t> || std::is_same_v<T, std::intptr_t>);
+        static_assert(std::is_pointer_v<T> || std::is_same_v<T, uptr> || std::is_same_v<T, sptr>);
        return reinterpret_cast<T>(as.GetCursorPointer());
    }

    template<typename T>
    T GetCursorPtr() const {
-        static_assert(std::is_pointer_v<T> || std::is_same_v<T, std::uintptr_t> || std::is_same_v<T, std::intptr_t>);
+        static_assert(std::is_pointer_v<T> || std::is_same_v<T, uptr> || std::is_same_v<T, sptr>);
        return reinterpret_cast<const T>(as.GetCursorPointer());
    }

@@ -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

 /* This file is part of the dynarmic project.
@@ -11,6 +11,7 @@

 #include <boost/icl/interval_set.hpp>
 #include "dynarmic/common/assert.h"
+#include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/backend/riscv64/a32_address_space.h"
@@ -33,18 +34,28 @@ struct Jit::Impl final {
    HaltReason Run() {
        ASSERT(!jit_interface->is_executing);
        jit_interface->is_executing = true;
+        SCOPE_EXIT {
+            jit_interface->is_executing = false;
+        };
+
        HaltReason hr = core.Run(current_address_space, current_state, &halt_reason);
+
        RequestCacheInvalidation();
-        jit_interface->is_executing = false;
+
        return hr;
    }

    HaltReason Step() {
        ASSERT(!jit_interface->is_executing);
        jit_interface->is_executing = true;
+        SCOPE_EXIT {
+            jit_interface->is_executing = false;
+        };
+
        UNIMPLEMENTED();
+
        RequestCacheInvalidation();
-        jit_interface->is_executing = false;
+
        return HaltReason{};
    }

@@ -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

 /* This file is part of the dynarmic project.
@@ -8,7 +8,7 @@

 #include "dynarmic/backend/riscv64/a32_jitstate.h"

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"

 namespace Dynarmic::Backend::RV64 {
@@ -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

 /* This file is part of the dynarmic project.
@@ -30,7 +30,7 @@ public:

    template<typename T>
    T ptr() const noexcept {
-        static_assert(std::is_pointer_v<T> || std::is_same_v<T, std::uintptr_t> || std::is_same_v<T, std::intptr_t>);
+        static_assert(std::is_pointer_v<T> || std::is_same_v<T, uptr> || std::is_same_v<T, sptr>);
        return reinterpret_cast<T>(mem);
    }

@@ -12,7 +12,7 @@

 #include <biscuit/assembler.hpp>
 #include <fmt/ostream.h>
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>

 #include "dynarmic/backend/riscv64/a32_jitstate.h"
 #include "dynarmic/backend/riscv64/abi.h"
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2024 MerryMage
 * SPDX-License-Identifier: 0BSD
@@ -167,12 +164,12 @@ void EmitIR<IR::Opcode::ArithmeticShiftRight64>(biscuit::Assembler&, EmitContext
 }

 template<>
-void EmitIR<IR::Opcode::BitRotateRight32>(biscuit::Assembler&, EmitContext&, IR::Inst*) {
+void EmitIR<IR::Opcode::RotateRight32>(biscuit::Assembler&, EmitContext&, IR::Inst*) {
    UNIMPLEMENTED();
 }

 template<>
-void EmitIR<IR::Opcode::BitRotateRight64>(biscuit::Assembler&, EmitContext&, IR::Inst*) {
+void EmitIR<IR::Opcode::RotateRight64>(biscuit::Assembler&, EmitContext&, IR::Inst*) {
    UNIMPLEMENTED();
 }

@@ -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

 /* This file is part of the dynarmic project.
@@ -12,6 +12,7 @@
 #include <array>

 #include "dynarmic/common/assert.h"
+#include <mcl/mp/metavalue/lift_value.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/common/always_false.h"
@@ -163,8 +164,9 @@ u32 RegAlloc::GenerateImmediate(const IR::Value& value) {
    } else if constexpr (kind == HostLoc::Kind::Fpr) {
        UNIMPLEMENTED();
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<kind>>);
    }
+
    return 0;
 }

@@ -223,7 +225,7 @@ u32 RegAlloc::RealizeReadImpl(const IR::Value& value) {
        fprs[new_location_index].realized = true;
        return new_location_index;
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<required_kind>>);
    }
 }

@@ -250,7 +252,7 @@ u32 RegAlloc::RealizeWriteImpl(const IR::Inst* value) {
        setup_location(fprs[new_location_index]);
        return new_location_index;
    } else {
-        UNREACHABLE();
+        static_assert(Common::always_false_v<mcl::mp::lift_value<required_kind>>);
    }
 }

@@ -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

 /* This file is part of the dynarmic project.
@@ -18,7 +18,7 @@
 #include <biscuit/registers.hpp>
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/is_instance_of_template.hpp"
+#include <mcl/type_traits/is_instance_of_template.hpp>
 #include <ankerl/unordered_dense.h>

 #include "dynarmic/backend/riscv64/stack_layout.h"
@@ -15,7 +15,8 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include "dynarmic/common/assert.h"
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
+#include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"
 #include <boost/container/static_vector.hpp>

@@ -13,7 +13,7 @@

 #include <fmt/format.h>
 #include <fmt/ostream.h>
-#include "dynarmic/mcl/integer_of_size.hpp"
+#include <mcl/type_traits/integer_of_size.hpp>
 #include "dynarmic/backend/x64/xbyak.h"

 #include "dynarmic/backend/x64/a32_emit_x64.h"
@@ -14,6 +14,7 @@
 #include <fmt/format.h>
 #include "dynarmic/common/assert.h"
 #include <bit>
+#include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/common/llvm_disassemble.h"

@@ -76,7 +77,12 @@ struct Jit::Impl {
    HaltReason Run() {
        ASSERT(!jit_interface->is_executing);
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&jit_state.halt_reason)));
+
        jit_interface->is_executing = true;
+        SCOPE_EXIT {
+            jit_interface->is_executing = false;
+        };
+
        const CodePtr current_codeptr = [this] {
            // RSB optimization
            const u32 new_rsb_ptr = (jit_state.rsb_ptr - 1) & A32JitState::RSBPtrMask;
@@ -87,19 +93,27 @@ struct Jit::Impl {

            return GetCurrentBlock();
        }();
+
        const HaltReason hr = block_of_code.RunCode(&jit_state, current_codeptr);
+
        PerformRequestedCacheInvalidation(hr);
-        jit_interface->is_executing = false;
+
        return hr;
    }

    HaltReason Step() {
        ASSERT(!jit_interface->is_executing);
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&jit_state.halt_reason)));
+
        jit_interface->is_executing = true;
+        SCOPE_EXIT {
+            jit_interface->is_executing = false;
+        };
+
        const HaltReason hr = block_of_code.StepCode(&jit_state, GetCurrentSingleStep());
+
        PerformRequestedCacheInvalidation(hr);
-        jit_interface->is_executing = false;
+
        return hr;
    }

@@ -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

 /* This file is part of the dynarmic project.
@@ -9,7 +9,7 @@
 #include "dynarmic/backend/x64/a32_jitstate.h"

 #include "dynarmic/common/assert.h"
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/backend/x64/block_of_code.h"
@@ -11,8 +11,9 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include "dynarmic/common/assert.h"
+#include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/integer_of_size.hpp"
+#include <mcl/type_traits/integer_of_size.hpp>
 #include <boost/container/static_vector.hpp>

 #include "dynarmic/backend/x64/a64_jitstate.h"
@@ -13,7 +13,7 @@

 #include <fmt/format.h>
 #include <fmt/ostream.h>
-#include "dynarmic/mcl/integer_of_size.hpp"
+#include <mcl/type_traits/integer_of_size.hpp>
 #include "dynarmic/backend/x64/xbyak.h"

 #include "dynarmic/backend/x64/a64_emit_x64.h"
@@ -15,6 +15,7 @@
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/llvm_disassemble.h"
 #include <bit>
+#include <mcl/scope_exit.hpp>

 #include "dynarmic/backend/x64/a64_emit_x64.h"
 #include "dynarmic/backend/x64/a64_jitstate.h"
@@ -74,8 +75,14 @@ public:
    HaltReason Run() {
        ASSERT(!is_executing);
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&jit_state.halt_reason)));
+
        is_executing = true;
+        SCOPE_EXIT {
+            this->is_executing = false;
+        };
+
        // TODO: Check code alignment
+
        const CodePtr current_code_ptr = [this] {
            // RSB optimization
            const u32 new_rsb_ptr = (jit_state.rsb_ptr - 1) & A64JitState::RSBPtrMask;
@@ -85,19 +92,27 @@ public:
            }
            return CodePtr((uintptr_t(GetCurrentBlock()) + 15) & ~uintptr_t(15));
        }();
+
        const HaltReason hr = block_of_code.RunCode(&jit_state, current_code_ptr);
+
        PerformRequestedCacheInvalidation(hr);
-        is_executing = false;
+
        return hr;
    }

    HaltReason Step() {
        ASSERT(!is_executing);
        PerformRequestedCacheInvalidation(static_cast<HaltReason>(Atomic::Load(&jit_state.halt_reason)));
+
        is_executing = true;
+        SCOPE_EXIT {
+            this->is_executing = false;
+        };
+
        const HaltReason hr = block_of_code.StepCode(&jit_state, GetCurrentSingleStep());
+
        PerformRequestedCacheInvalidation(hr);
-        is_executing = false;
+
        return hr;
    }

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2016 MerryMage
 * SPDX-License-Identifier: 0BSD
@@ -8,7 +5,7 @@

 #include "dynarmic/backend/x64/a64_jitstate.h"

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>

 #include "dynarmic/frontend/A64/a64_location_descriptor.h"

@@ -25,7 +25,7 @@
 #include <cstring>

 #include "dynarmic/common/assert.h"
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/backend/x64/xbyak.h"

 #include "dynarmic/backend/x64/a32_jitstate.h"
@@ -13,7 +13,7 @@
 #include <memory>
 #include <type_traits>

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/backend/x64/xbyak.h"
 #include "dynarmic/backend/x64/abi.h"
@@ -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

 /* This file is part of the dynarmic project.
@@ -10,7 +10,7 @@

 #include <optional>

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/common/fp/rounding_mode.h"
@@ -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

 /* This file is part of the dynarmic project.
@@ -13,7 +13,7 @@

 #include <bit>
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/function_info.hpp"
+#include <mcl/type_traits/function_info.hpp>

 #include "dynarmic/backend/x64/callback.h"

@@ -12,7 +12,8 @@

 #include "dynarmic/common/assert.h"
 #include <boost/variant/detail/apply_visitor_binary.hpp>
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
+#include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"
 #include <ankerl/unordered_dense.h>

@@ -16,7 +16,7 @@
 #include <type_traits>
 #include <vector>

-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bitsizeof.hpp>
 #include <ankerl/unordered_dense.h>
 #include "dynarmic/backend/x64/xbyak.h"
 #include <boost/container/small_vector.hpp>
@@ -663,7 +663,7 @@ void EmitX64::EmitArithmeticShiftRight64(EmitContext& ctx, IR::Inst* inst) {
    }
 }

-void EmitX64::EmitBitRotateRight32(EmitContext& ctx, IR::Inst* inst) {
+void EmitX64::EmitRotateRight32(EmitContext& ctx, IR::Inst* inst) {
    const auto carry_inst = inst->GetAssociatedPseudoOperation(IR::Opcode::GetCarryFromOp);

    auto args = ctx.reg_alloc.GetArgumentInfo(inst);
@@ -736,7 +736,7 @@ void EmitX64::EmitBitRotateRight32(EmitContext& ctx, IR::Inst* inst) {
    }
 }

-void EmitX64::EmitBitRotateRight64(EmitContext& ctx, IR::Inst* inst) {
+void EmitX64::EmitRotateRight64(EmitContext& ctx, IR::Inst* inst) {
    auto args = ctx.reg_alloc.GetArgumentInfo(inst);
    auto& operand_arg = args[0];
    auto& shift_arg = args[1];
@@ -11,8 +11,14 @@
 #include <utility>

 #include "dynarmic/common/assert.h"
+#include <mcl/mp/metavalue/lift_value.hpp>
+#include <mcl/mp/typelist/cartesian_product.hpp>
+#include <mcl/mp/typelist/get.hpp>
+#include <mcl/mp/typelist/lift_sequence.hpp>
+#include <mcl/mp/typelist/list.hpp>
+#include <mcl/mp/typelist/lower_to_tuple.hpp>
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/integer_of_size.hpp"
+#include <mcl/type_traits/integer_of_size.hpp>
 #include "dynarmic/backend/x64/xbyak.h"

 #include "dynarmic/backend/x64/abi.h"
@@ -35,6 +41,7 @@
 namespace Dynarmic::Backend::X64 {

 using namespace Xbyak::util;
+namespace mp = mcl::mp;

 namespace {

@@ -3,8 +3,7 @@
 * SPDX-License-Identifier: 0BSD
 */

-#define CONCATENATE_TOKENS(x, y) CONCATENATE_TOKENS_IMPL(x, y)
-#define CONCATENATE_TOKENS_IMPL(x, y) x##y
+#include <mcl/macro/concatenate_tokens.hpp>

 #define AxxEmitX64 CONCATENATE_TOKENS(Axx, EmitX64)
 #define AxxEmitContext CONCATENATE_TOKENS(Axx, EmitContext)
@@ -6,8 +6,6 @@
 * SPDX-License-Identifier: 0BSD
 */

-#pragma once
-
 #include <bit>
 #include "dynarmic/backend/x64/xbyak.h"

@@ -24,9 +22,9 @@ namespace {

 using namespace Xbyak::util;

-constexpr size_t page_table_const_bits = 12;
-constexpr size_t page_table_const_size = 1 << page_table_const_bits;
-constexpr size_t page_table_const_mask = (1 << page_table_const_bits) - 1;
+constexpr size_t page_bits = 12;
+constexpr size_t page_size = 1 << page_bits;
+constexpr size_t page_mask = (1 << page_bits) - 1;

 template<typename EmitContext>
 void EmitDetectMisalignedVAddr(BlockOfCode& code, EmitContext& ctx, size_t bitsize, Xbyak::Label& abort, Xbyak::Reg64 vaddr, Xbyak::Reg64 tmp) {
@@ -52,7 +50,7 @@ void EmitDetectMisalignedVAddr(BlockOfCode& code, EmitContext& ctx, size_t bitsi
    code.test(vaddr, align_mask);

    if (ctx.conf.only_detect_misalignment_via_page_table_on_page_boundary) {
-        const u32 page_align_mask = static_cast<u32>(page_table_const_size - 1) & ~align_mask;
+        const u32 page_align_mask = static_cast<u32>(page_size - 1) & ~align_mask;

        SharedLabel detect_boundary = GenSharedLabel(), resume = GenSharedLabel();

@@ -85,7 +83,7 @@ template<>
    // TODO: This code assumes vaddr has been zext from 32-bits to 64-bits.

    code.mov(tmp, vaddr.cvt32());
-    code.shr(tmp, int(page_table_const_bits));
+    code.shr(tmp, int(page_bits));
    code.shl(tmp, int(ctx.conf.page_table_log2_stride));
    code.mov(page, qword[r14 + tmp.cvt64()]);
    if (ctx.conf.page_table_pointer_mask_bits == 0) {
@@ -98,13 +96,13 @@ template<>
        return page + vaddr;
    }
    code.mov(tmp, vaddr.cvt32());
-    code.and_(tmp, static_cast<u32>(page_table_const_mask));
+    code.and_(tmp, static_cast<u32>(page_mask));
    return page + tmp.cvt64();
 }

 template<>
 [[maybe_unused]] Xbyak::RegExp EmitVAddrLookup<A64EmitContext>(BlockOfCode& code, A64EmitContext& ctx, size_t bitsize, Xbyak::Label& abort, Xbyak::Reg64 vaddr) {
-    const size_t valid_page_index_bits = ctx.conf.page_table_address_space_bits - page_table_const_bits;
+    const size_t valid_page_index_bits = ctx.conf.page_table_address_space_bits - page_bits;
    const size_t unused_top_bits = 64 - ctx.conf.page_table_address_space_bits;

    const Xbyak::Reg64 page = ctx.reg_alloc.ScratchGpr(code);
@@ -114,29 +112,29 @@ template<>

    if (unused_top_bits == 0) {
        code.mov(tmp, vaddr);
-        code.shr(tmp, int(page_table_const_bits));
+        code.shr(tmp, int(page_bits));
    } else if (ctx.conf.silently_mirror_page_table) {
        if (valid_page_index_bits >= 32) {
            if (code.HasHostFeature(HostFeature::BMI2)) {
                const Xbyak::Reg64 bit_count = ctx.reg_alloc.ScratchGpr(code);
                code.mov(bit_count, unused_top_bits);
                code.bzhi(tmp, vaddr, bit_count);
-                code.shr(tmp, int(page_table_const_bits));
+                code.shr(tmp, int(page_bits));
                ctx.reg_alloc.Release(bit_count);
            } else {
                code.mov(tmp, vaddr);
                code.shl(tmp, int(unused_top_bits));
-                code.shr(tmp, int(unused_top_bits + page_table_const_bits));
+                code.shr(tmp, int(unused_top_bits + page_bits));
            }
        } else {
            code.mov(tmp, vaddr);
-            code.shr(tmp, int(page_table_const_bits));
+            code.shr(tmp, int(page_bits));
            code.and_(tmp, u32((1 << valid_page_index_bits) - 1));
        }
    } else {
        ASSERT(valid_page_index_bits < 32);
        code.mov(tmp, vaddr);
-        code.shr(tmp, int(page_table_const_bits));
+        code.shr(tmp, int(page_bits));
        code.test(tmp, u32(-(1 << valid_page_index_bits)));
        code.jnz(abort, code.T_NEAR);
    }
@@ -153,7 +151,7 @@ template<>
        return page + vaddr;
    }
    code.mov(tmp, vaddr);
-    code.and_(tmp, static_cast<u32>(page_table_const_mask));
+    code.and_(tmp, static_cast<u32>(page_mask));
    return page + tmp;
 }

@@ -9,9 +9,9 @@
 #include <limits>

 #include "dynarmic/common/assert.h"
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/integer_of_size.hpp"
+#include <mcl/type_traits/integer_of_size.hpp>

 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/backend/x64/emit_x64.h"
@@ -25,12 +25,12 @@ using namespace Xbyak::util;

 namespace {

-enum class SaturationOp {
+enum class Op {
    Add,
    Sub,
 };

-template<SaturationOp op, size_t size, bool has_overflow_inst = false>
+template<Op op, size_t size, bool has_overflow_inst = false>
 void EmitSignedSaturatedOp(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
    auto args = ctx.reg_alloc.GetArgumentInfo(inst);

@@ -51,7 +51,7 @@ void EmitSignedSaturatedOp(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst)

    // overflow now contains 0x7F... if a was positive, or 0x80... if a was negative

-    if constexpr (op == SaturationOp::Add) {
+    if constexpr (op == Op::Add) {
        code.add(result, addend);
    } else {
        code.sub(result, addend);
@@ -75,16 +75,16 @@ void EmitSignedSaturatedOp(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst)
    ctx.reg_alloc.DefineValue(code, inst, result);
 }

-template<SaturationOp op, size_t size>
+template<Op op, size_t size>
 void EmitUnsignedSaturatedOp(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
    auto args = ctx.reg_alloc.GetArgumentInfo(inst);

    Xbyak::Reg op_result = ctx.reg_alloc.UseScratchGpr(code, args[0]).changeBit(size);
    Xbyak::Reg addend = ctx.reg_alloc.UseScratchGpr(code, args[1]).changeBit(size);

-    constexpr u64 boundary = op == SaturationOp::Add ? (std::numeric_limits<mcl::unsigned_integer_of_size<size>>::max)() : 0;
+    constexpr u64 boundary = op == Op::Add ? (std::numeric_limits<mcl::unsigned_integer_of_size<size>>::max)() : 0;

-    if constexpr (op == SaturationOp::Add) {
+    if constexpr (op == Op::Add) {
        code.add(op_result, addend);
    } else {
        code.sub(op_result, addend);
@@ -106,11 +106,11 @@ void EmitUnsignedSaturatedOp(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst
 }  // anonymous namespace

 void EmitX64::EmitSignedSaturatedAddWithFlag32(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Add, 32, true>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Add, 32, true>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedSubWithFlag32(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Sub, 32, true>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Sub, 32, true>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturation(EmitContext& ctx, IR::Inst* inst) {
@@ -192,19 +192,19 @@ void EmitX64::EmitUnsignedSaturation(EmitContext& ctx, IR::Inst* inst) {
 }

 void EmitX64::EmitSignedSaturatedAdd8(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Add, 8>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Add, 8>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedAdd16(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Add, 16>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Add, 16>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedAdd32(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Add, 32>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Add, 32>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedAdd64(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Add, 64>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Add, 64>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedDoublingMultiplyReturnHigh16(EmitContext& ctx, IR::Inst* inst) {
@@ -256,51 +256,51 @@ void EmitX64::EmitSignedSaturatedDoublingMultiplyReturnHigh32(EmitContext& ctx,
 }

 void EmitX64::EmitSignedSaturatedSub8(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Sub, 8>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Sub, 8>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedSub16(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Sub, 16>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Sub, 16>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedSub32(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Sub, 32>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Sub, 32>(code, ctx, inst);
 }

 void EmitX64::EmitSignedSaturatedSub64(EmitContext& ctx, IR::Inst* inst) {
-    EmitSignedSaturatedOp<SaturationOp::Sub, 64>(code, ctx, inst);
+    EmitSignedSaturatedOp<Op::Sub, 64>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedAdd8(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Add, 8>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Add, 8>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedAdd16(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Add, 16>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Add, 16>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedAdd32(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Add, 32>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Add, 32>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedAdd64(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Add, 64>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Add, 64>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedSub8(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Sub, 8>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Sub, 8>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedSub16(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Sub, 16>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Sub, 16>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedSub32(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Sub, 32>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Sub, 32>(code, ctx, inst);
 }

 void EmitX64::EmitUnsignedSaturatedSub64(EmitContext& ctx, IR::Inst* inst) {
-    EmitUnsignedSaturatedOp<SaturationOp::Sub, 64>(code, ctx, inst);
+    EmitUnsignedSaturatedOp<Op::Sub, 64>(code, ctx, inst);
 }

 }  // namespace Dynarmic::Backend::X64
@@ -13,9 +13,11 @@
 #include <type_traits>

 #include "dynarmic/common/assert.h"
-#include "dynarmic/mcl/bit.hpp"
+#include <mcl/bit/bit_count.hpp>
+#include <mcl/bit/bit_field.hpp>
+#include <mcl/bitsizeof.hpp>
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/mcl/function_info.hpp"
+#include <mcl/type_traits/function_info.hpp>
 #include "dynarmic/backend/x64/xbyak.h"

 #include "dynarmic/backend/x64/abi.h"
@@ -5854,5 +5856,3 @@ void EmitX64::EmitZeroVector(EmitContext& ctx, IR::Inst* inst) {
 }

 }  // namespace Dynarmic::Backend::X64
-
-#undef ICODE
@@ -13,8 +13,14 @@
 #include <utility>

 #include "dynarmic/common/assert.h"
-#include "dynarmic/mcl/function_info.hpp"
-#include "dynarmic/mcl/integer_of_size.hpp"
+#include <mcl/mp/metavalue/lift_value.hpp>
+#include <mcl/mp/typelist/cartesian_product.hpp>
+#include <mcl/mp/typelist/get.hpp>
+#include <mcl/mp/typelist/lift_sequence.hpp>
+#include <mcl/mp/typelist/list.hpp>
+#include <mcl/mp/typelist/lower_to_tuple.hpp>
+#include <mcl/type_traits/function_info.hpp>
+#include <mcl/type_traits/integer_of_size.hpp>
 #include "dynarmic/backend/x64/xbyak.h"

 #include "dynarmic/backend/x64/abi.h"
@@ -35,6 +41,7 @@
 namespace Dynarmic::Backend::X64 {

 using namespace Xbyak::util;
+namespace mp = mcl::mp;

 namespace {

@@ -1993,7 +2000,6 @@ void EmitX64::EmitFPVectorToHalf32(EmitContext& ctx, IR::Inst* inst) {
    }
 }

-
 // Assembly thunk; just remember not to specialise too much otherwise i-cache death!
 // template<typename FPT, size_t fbits, FP::RoundingMode rounding_mode>
 // static void EmitFPVectorToFixedThunk(VectorArray<FPT>& output, const VectorArray<FPT>& input, FP::FPCR fpcr, FP::FPSR& fpsr) {
@@ -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

 /* This file is part of the dynarmic project.
@@ -52,12 +52,12 @@ void EmitVectorSaturatedNative(BlockOfCode& code, EmitContext& ctx, IR::Inst* in
    ctx.reg_alloc.DefineValue(code, inst, result);
 }

-enum class VectorSaturationOp {
+enum class Op {
    Add,
    Sub,
 };

-template<VectorSaturationOp op, size_t esize>
+template<Op op, size_t esize>
 void EmitVectorSignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
    static_assert(esize == 32 || esize == 64);
    constexpr u64 msb_mask = esize == 32 ? 0x8000000080000000 : 0x8000000000000000;
@@ -72,7 +72,7 @@ void EmitVectorSignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst* in

        code.movaps(xmm0, operand1);

-        if constexpr (op == VectorSaturationOp::Add) {
+        if constexpr (op == Op::Add) {
            ICODE(vpadd)(result, operand1, operand2);
            code.vpternlogd(xmm0, result, operand2, 0b00100100);
        } else {
@@ -102,7 +102,7 @@ void EmitVectorSignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst* in
    const Xbyak::Xmm tmp = ctx.reg_alloc.ScratchXmm(code);

    if (code.HasHostFeature(HostFeature::AVX)) {
-        if constexpr (op == VectorSaturationOp::Add) {
+        if constexpr (op == Op::Add) {
            ICODE(vpadd)(result, operand1, operand2);
        } else {
            ICODE(vpsub)(result, operand1, operand2);
@@ -112,7 +112,7 @@ void EmitVectorSignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst* in
    } else {
        code.movaps(xmm0, operand1);
        code.movaps(tmp, operand1);
-        if constexpr (op == VectorSaturationOp::Add) {
+        if constexpr (op == Op::Add) {
            ICODE(padd)(result, operand2);
        } else {
            ICODE(psub)(result, operand2);
@@ -121,7 +121,7 @@ void EmitVectorSignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst* in
        code.pxor(tmp, result);
    }

-    if constexpr (op == VectorSaturationOp::Add) {
+    if constexpr (op == Op::Add) {
        code.pandn(xmm0, tmp);
    } else {
        code.pand(xmm0, tmp);
@@ -165,7 +165,7 @@ void EmitVectorSignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst* in
    }
 }

-template<VectorSaturationOp op, size_t esize>
+template<Op op, size_t esize>
 void EmitVectorUnsignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
    static_assert(esize == 32 || esize == 64);

@@ -177,7 +177,7 @@ void EmitVectorUnsignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst*
        const Xbyak::Xmm result = ctx.reg_alloc.ScratchXmm(code);
        const Xbyak::Reg8 overflow = ctx.reg_alloc.ScratchGpr(code).cvt8();

-        if constexpr (op == VectorSaturationOp::Add) {
+        if constexpr (op == Op::Add) {
            ICODE(vpadd)(result, operand1, operand2);
            ICODE(vpcmpu)(k1, result, operand1, CmpInt::LessThan);
            ICODE(vpternlog)(result | k1, result, result, u8(0xFF));
@@ -201,7 +201,7 @@ void EmitVectorUnsignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst*
    const Xbyak::Reg8 overflow = ctx.reg_alloc.ScratchGpr(code).cvt8();
    const Xbyak::Xmm tmp = ctx.reg_alloc.ScratchXmm(code);

-    if constexpr (op == VectorSaturationOp::Add) {
+    if constexpr (op == Op::Add) {
        if (code.HasHostFeature(HostFeature::AVX)) {
            code.vpxor(xmm0, operand1, operand2);
            code.vpand(tmp, operand1, operand2);
@@ -250,7 +250,7 @@ void EmitVectorUnsignedSaturated(BlockOfCode& code, EmitContext& ctx, IR::Inst*
    code.setnz(overflow);
    code.or_(code.byte[code.ABI_JIT_PTR + code.GetJitStateInfo().offsetof_fpsr_qc], overflow);

-    if constexpr (op == VectorSaturationOp::Add) {
+    if constexpr (op == Op::Add) {
        code.por(result, tmp);
        ctx.reg_alloc.DefineValue(code, inst, result);
    } else {
@@ -270,11 +270,11 @@ void EmitX64::EmitVectorSignedSaturatedAdd16(EmitContext& ctx, IR::Inst* inst) {
 }

 void EmitX64::EmitVectorSignedSaturatedAdd32(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorSignedSaturated<VectorSaturationOp::Add, 32>(code, ctx, inst);
+    EmitVectorSignedSaturated<Op::Add, 32>(code, ctx, inst);
 }

 void EmitX64::EmitVectorSignedSaturatedAdd64(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorSignedSaturated<VectorSaturationOp::Add, 64>(code, ctx, inst);
+    EmitVectorSignedSaturated<Op::Add, 64>(code, ctx, inst);
 }

 void EmitX64::EmitVectorSignedSaturatedSub8(EmitContext& ctx, IR::Inst* inst) {
@@ -286,11 +286,11 @@ void EmitX64::EmitVectorSignedSaturatedSub16(EmitContext& ctx, IR::Inst* inst) {
 }

 void EmitX64::EmitVectorSignedSaturatedSub32(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorSignedSaturated<VectorSaturationOp::Sub, 32>(code, ctx, inst);
+    EmitVectorSignedSaturated<Op::Sub, 32>(code, ctx, inst);
 }

 void EmitX64::EmitVectorSignedSaturatedSub64(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorSignedSaturated<VectorSaturationOp::Sub, 64>(code, ctx, inst);
+    EmitVectorSignedSaturated<Op::Sub, 64>(code, ctx, inst);
 }

 void EmitX64::EmitVectorUnsignedSaturatedAdd8(EmitContext& ctx, IR::Inst* inst) {
@@ -302,11 +302,11 @@ void EmitX64::EmitVectorUnsignedSaturatedAdd16(EmitContext& ctx, IR::Inst* inst)
 }

 void EmitX64::EmitVectorUnsignedSaturatedAdd32(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorUnsignedSaturated<VectorSaturationOp::Add, 32>(code, ctx, inst);
+    EmitVectorUnsignedSaturated<Op::Add, 32>(code, ctx, inst);
 }

 void EmitX64::EmitVectorUnsignedSaturatedAdd64(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorUnsignedSaturated<VectorSaturationOp::Add, 64>(code, ctx, inst);
+    EmitVectorUnsignedSaturated<Op::Add, 64>(code, ctx, inst);
 }

 void EmitX64::EmitVectorUnsignedSaturatedSub8(EmitContext& ctx, IR::Inst* inst) {
@@ -318,11 +318,11 @@ void EmitX64::EmitVectorUnsignedSaturatedSub16(EmitContext& ctx, IR::Inst* inst)
 }

 void EmitX64::EmitVectorUnsignedSaturatedSub32(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorUnsignedSaturated<VectorSaturationOp::Sub, 32>(code, ctx, inst);
+    EmitVectorUnsignedSaturated<Op::Sub, 32>(code, ctx, inst);
 }

 void EmitX64::EmitVectorUnsignedSaturatedSub64(EmitContext& ctx, IR::Inst* inst) {
-    EmitVectorUnsignedSaturated<VectorSaturationOp::Sub, 64>(code, ctx, inst);
+    EmitVectorUnsignedSaturated<Op::Sub, 64>(code, ctx, inst);
 }

 }  // namespace Dynarmic::Backend::X64
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lizzie	84b1a6ebf0	ONE last parentehsis	2026-03-26 03:43:45 +00:00
lizzie	152c9f7a7b	wtf	2026-03-26 03:42:38 +00:00
lizzie	f8c02e20f6	ok fix parenthesis?	2026-03-26 03:41:28 +00:00
lizzie	6ea6198ba7	license	2026-03-26 03:41:28 +00:00
lizzie	7b50ca91d9	[cmake] fixes for XCode when having languages other than C/C++ Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-03-26 03:41:28 +00:00