forgot comma... haha

androiiii
default=1
2026-05-30 18:57:04 +02:00 · 2026-03-27 01:17:38 +01:00 · 2026-03-27 01:17:38 +01:00 · 2026-03-27 01:17:38 +01:00 · 2026-03-27 01:17:38 +01:00 · 2026-03-27 01:11:49 +01:00
134 changed files with 1619 additions and 555 deletions
--- a/.ci/actool.sh
+++ b/.ci/actool.sh
@ -0,0 +1,22 @@
+#!/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
--- a/.patch/mcl/0001-assert-macro.patch
+++ b/.patch/mcl/0001-assert-macro.patch
@ -1,55 +0,0 @@
-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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -486,10 +486,10 @@ endfunction()
 # =============================================

 if (APPLE)
-    # 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})
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia)
+        find_library(${fw}_LIBRARY ${fw} REQUIRED)
+        list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
+    endforeach()
 elseif (WIN32)
    # Target Windows 10
    add_compile_definitions(_WIN32_WINNT=0x0A00 WINVER=0x0A00)
@ -526,7 +526,6 @@ if (NOT YUZU_STATIC_ROOM)
    find_package(SPIRV-Tools)
    find_package(sirit)
    find_package(gamemode)
-    find_package(mcl)
    find_package(frozen)

    if (ARCHITECTURE_riscv64)
--- a/dist/Assets.car
+++ b/dist/Assets.car
--- a/dist/eden.icns
+++ b/dist/eden.icns
--- a/dist/eden.icon/Assets/dev.eden_emu.eden.svg
+++ b/dist/eden.icon/Assets/dev.eden_emu.eden.svg
@ -0,0 +1,230 @@
+<?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>
--- a/dist/eden.icon/icon.json
+++ b/dist/eden.icon/icon.json
@ -0,0 +1,37 @@
+{
+  "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"
+  }
+}
--- a/docs/Deps.md
+++ b/docs/Deps.md
@ -76,7 +76,6 @@ 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:

--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -76,9 +76,6 @@ if (ARCHITECTURE_riscv64)
    AddJsonPackage(biscuit)
 endif()

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

--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@ -208,18 +208,6 @@
        "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%",
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
@ -69,7 +69,8 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
    MY_PAGE_APPLET("my_page_applet_mode"),
    INPUT_OVERLAY_AUTO_HIDE("input_overlay_auto_hide"),
    OVERLAY_GRID_SIZE("overlay_grid_size"),
-    GPU_LOG_RING_BUFFER_SIZE("gpu_log_ring_buffer_size")
+    GPU_LOG_RING_BUFFER_SIZE("gpu_log_ring_buffer_size"),
+    PRODUCT_MODEL("product_model")
    ;

    override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@ -965,6 +965,16 @@ abstract class SettingsItem(
                    max = 4096
                )
            )
+            put(
+                SpinBoxSetting(
+                    IntSetting.PRODUCT_MODEL,
+                    titleId = R.string.product_model,
+                    descriptionId = R.string.product_model_description,
+                    valueHint = R.string.product_model,
+                    min = 1,
+                    max = 2
+                )
+            )

            val fastmem = object : AbstractBooleanSetting {
                override fun getBoolean(needsGlobal: Boolean): Boolean =
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
@ -1265,6 +1265,7 @@ class SettingsFragmentPresenter(
            add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key)
            add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key)
            add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key)
+            add(IntSetting.PRODUCT_MODEL.key)
        }
    }

--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -586,6 +586,9 @@
    <string name="gpu_log_ring_buffer_size_description">Number of recent Vulkan calls to track (default: 512)</string>
    <string name="gpu_log_ring_buffer_size_hint">64 to 4096 entries</string>

+    <string name="product_model">Product model</string>
+    <string name="product_model_description">Reported product model by HLE firmware</string>
+
    <string name="general">General</string>

    <!-- Audio settings strings -->
--- a/src/common/settings.h
+++ b/src/common/settings.h
@ -640,6 +640,7 @@ struct Values {
    SwitchableSetting<TimeZone, true> time_zone_index{linkage, TimeZone::Auto, "time_zone_index", Category::System};
    Setting<u32> serial_battery{linkage, 0, "serial_battery", Category::System};
    Setting<u32> serial_unit{linkage, 0, "serial_unit", Category::System};
+    Setting<u32> product_model{linkage, 1, "product_model", Category::System};
    // Measured in seconds since epoch
    SwitchableSetting<bool> custom_rtc_enabled{linkage, false, "custom_rtc_enabled", Category::System, Specialization::Paired, true, true};
    SwitchableSetting<s64> custom_rtc{
--- a/src/core/hle/service/set/system_settings_server.cpp
+++ b/src/core/hle/service/set/system_settings_server.cpp
@ -1158,8 +1158,8 @@ Result ISystemSettingsServer::SetDeviceNickName(

 Result ISystemSettingsServer::GetProductModel(Out<u32> out_product_model) {
    // Most certainly should be 1 -- definitely should not be 2, but it's worth tinkering with anyways
-    u32 const product_model = 1;
-    LOG_WARNING(Service_SET, "(STUBBED) called, product_model={}", product_model);
+    auto const product_model = ::Settings::values.product_model.GetValue();
+    LOG_INFO(Service_SET, "called, product_model={}", product_model);
    *out_product_model = product_model;
    R_SUCCEED();
 }
--- a/src/core/hle/service/vi/shared_buffer_manager.cpp
+++ b/src/core/hle/service/vi/shared_buffer_manager.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@ -373,6 +373,8 @@ Result SharedBufferManager::PresentSharedFrameBuffer(android::Fence fence,
                 android::Status::NoError,
             VI::ResultOperationFailed);

+    (void)m_container.SetLayerZIndex(layer_id, 100000);
+
    // We succeeded.
    R_SUCCEED();
 }
--- a/src/dynarmic/CMakeLists.txt
+++ b/src/dynarmic/CMakeLists.txt
@ -78,7 +78,9 @@ 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)
+        /DNOMINMAX
+        /GR-
+    )

    if (CXX_CLANG)
        list(APPEND DYNARMIC_CXX_FLAGS
@ -91,8 +93,10 @@ else()
        -Wextra
        -Wcast-qual
        -pedantic
-        -Wno-missing-braces)
-
+        -Wno-missing-braces
+        -fno-rtti
+        #-fno-exceptions
+    )
    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&
@ -102,7 +106,6 @@ 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.
@ -117,7 +120,6 @@ 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)
--- a/src/dynarmic/CMakeModules/impl/TargetArchitectureSpecificSourcesWrapFile.cmake
+++ b/src/dynarmic/CMakeModules/impl/TargetArchitectureSpecificSourcesWrapFile.cmake
@ -1,3 +1,6 @@
+# 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}" "#include <mcl/macro/architecture.hpp>\n#if defined(MCL_ARCHITECTURE_${arch})\n${f_contents}\n#endif\n")
+file(WRITE "${output_file}" "#if defined(ARCHITECTURE_${arch})\n${f_contents}\n#endif\n")
--- a/src/dynarmic/src/dynarmic/CMakeLists.txt
+++ b/src/dynarmic/src/dynarmic/CMakeLists.txt
@ -3,6 +3,12 @@
 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
@ -353,7 +359,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 merry::mcl)
+target_link_libraries(dynarmic PUBLIC fmt::fmt)

 if (BOOST_NO_HEADERS)
    target_link_libraries(dynarmic PRIVATE Boost::variant Boost::icl Boost::pool)
--- a/src/dynarmic/src/dynarmic/backend/arm64/a32_interface.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/a32_interface.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #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"
@ -36,14 +35,9 @@ 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;
    }

@ -52,14 +46,9 @@ 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;
    }

--- a/src/dynarmic/src/dynarmic/backend/arm64/a32_jitstate.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/a32_jitstate.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

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

 namespace Dynarmic::Backend::Arm64 {
--- a/src/dynarmic/src/dynarmic/backend/arm64/a64_interface.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/a64_interface.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #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"
@ -34,32 +33,20 @@ 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;
    }

--- a/src/dynarmic/src/dynarmic/backend/arm64/abi.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/abi.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #include <vector>

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

--- a/src/dynarmic/src/dynarmic/backend/arm64/abi.h
+++ b/src/dynarmic/src/dynarmic/backend/arm64/abi.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -12,7 +12,6 @@
 #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>
@ -37,7 +36,7 @@ constexpr auto Rscratch0() {
    } else if constexpr (bitsize == 64) {
        return Xscratch0;
    } else {
-        static_assert(Common::always_false_v<mcl::mp::lift_value<bitsize>>);
+        return Xscratch0; //UNREACHABLE();
    }
 }

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

--- a/src/dynarmic/src/dynarmic/backend/arm64/devirtualize.h
+++ b/src/dynarmic/src/dynarmic/backend/arm64/devirtualize.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 namespace Dynarmic::Backend::Arm64 {

--- a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_a32.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_a32.cpp
@ -6,7 +6,7 @@
 * SPDX-License-Identifier: 0BSD
 */

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

 #include "dynarmic/backend/arm64/a32_jitstate.h"
--- a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_vector.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_vector.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

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

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

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

--- a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_vector_floating_point.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_vector_floating_point.cpp
@ -7,14 +7,8 @@
 */

 #include <bit>
-#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/mcl/function_info.hpp"
+#include "dynarmic/mcl/integer_of_size.hpp"
 #include <oaknut/oaknut.hpp>

 #include "dynarmic/backend/arm64/a32_jitstate.h"
@ -38,8 +32,6 @@
 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
@ -83,7 +75,7 @@ static void EmitTwoOpArranged(oaknut::CodeGenerator& code, EmitContext& ctx, IR:
        } else if constexpr (size == 64) {
            emit(Qresult->D2(), Qa->D2());
        } else {
-            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
+            UNREACHABLE();
        }
    });
 }
@ -111,7 +103,7 @@ static void EmitThreeOpArranged(oaknut::CodeGenerator& code, EmitContext& ctx, I
        } else if constexpr (size == 64) {
            emit(Qresult->D2(), Qa->D2(), Qb->D2());
        } else {
-            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
+            UNREACHABLE();
        }
    });
 }
@ -134,7 +126,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 {
-            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
+            UNREACHABLE();
        }
    });
 }
@ -156,7 +148,7 @@ static void EmitFromFixed(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Ins
        } else if constexpr (size == 64) {
            emit(Qto->D2(), Qfrom->D2(), fbits);
        } else {
-            static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
+            UNREACHABLE();
        }
    });
 }
@ -178,7 +170,7 @@ void EmitToFixed(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst)
        } else if constexpr (fsize == 64) {
            return Qto->D2();
        } else {
-            static_assert(Common::always_false_v<mcl::mp::lift_value<fsize>>);
+            UNREACHABLE();
        }
    }();
    auto Vfrom = [&] {
@ -187,7 +179,7 @@ void EmitToFixed(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst)
        } else if constexpr (fsize == 64) {
            return Qfrom->D2();
        } else {
-            static_assert(Common::always_false_v<mcl::mp::lift_value<fsize>>);
+            UNREACHABLE();
        }
    }();

--- a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_vector_saturation.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_vector_saturation.cpp
@ -1,9 +1,11 @@
+// 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"
@ -39,7 +41,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 {
-        static_assert(Common::always_false_v<mcl::mp::lift_value<size>>);
+        UNREACHABLE();
    }
 }

--- a/src/dynarmic/src/dynarmic/backend/arm64/fastmem.h
+++ b/src/dynarmic/src/dynarmic/backend/arm64/fastmem.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #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"

@ -22,9 +21,16 @@ 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 {
-    size_t operator()(const DoNotFastmemMarker& value) const {
-        return mcl::hash::xmrx(std::get<0>(value).Value() ^ static_cast<u64>(std::get<1>(value)));
+    [[nodiscard]] constexpr size_t operator()(const DoNotFastmemMarker& value) const noexcept {
+        return xmrx(std::get<0>(value).Value() ^ u64(std::get<1>(value)));
    }
 };

--- a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp
@ -13,9 +13,8 @@
 #include <iterator>

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

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

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

@ -366,7 +365,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 {
-        static_assert(Common::always_false_v<mcl::mp::lift_value<required_kind>>);
+        UNREACHABLE();
    }
 }

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

@ -410,7 +409,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 {
-        static_assert(Common::always_false_v<mcl::mp::lift_value<kind>>);
+        UNREACHABLE();
    }
 }

--- a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h
+++ b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h
@ -16,7 +16,7 @@

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

--- a/src/dynarmic/src/dynarmic/backend/exception_handler.h
+++ b/src/dynarmic/src/dynarmic/backend/exception_handler.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #if defined(ARCHITECTURE_x86_64)
--- a/src/dynarmic/src/dynarmic/backend/exception_handler_macos.cpp
+++ b/src/dynarmic/src/dynarmic/backend/exception_handler_macos.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -16,11 +16,10 @@
 #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"
--- a/src/dynarmic/src/dynarmic/backend/exception_handler_macos_mig.c
+++ b/src/dynarmic/src/dynarmic/backend/exception_handler_macos_mig.c
@ -3,8 +3,6 @@
 * 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)
--- a/src/dynarmic/src/dynarmic/backend/exception_handler_windows.cpp
+++ b/src/dynarmic/src/dynarmic/backend/exception_handler_windows.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -6,8 +6,6 @@
 * 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)
--- a/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.cpp
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.cpp
@ -99,7 +99,7 @@ void A32AddressSpace::SetCursorPtr(CodePtr ptr) {
 }

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

 EmittedBlockInfo A32AddressSpace::Emit(IR::Block block) {
--- a/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.h
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.h
@ -41,25 +41,25 @@ private:

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

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

--- a/src/dynarmic/src/dynarmic/backend/riscv64/a32_interface.cpp
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/a32_interface.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #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"
@ -34,28 +33,18 @@ 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{};
    }

--- a/src/dynarmic/src/dynarmic/backend/riscv64/a32_jitstate.cpp
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/a32_jitstate.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

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

 namespace Dynarmic::Backend::RV64 {
--- a/src/dynarmic/src/dynarmic/backend/riscv64/code_block.h
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/code_block.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* 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, uptr> || std::is_same_v<T, sptr>);
+        static_assert(std::is_pointer_v<T> || std::is_same_v<T, std::uintptr_t> || std::is_same_v<T, std::intptr_t>);
        return reinterpret_cast<T>(mem);
    }

--- a/src/dynarmic/src/dynarmic/backend/riscv64/emit_riscv64.cpp
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/emit_riscv64.cpp
@ -12,7 +12,7 @@

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

 #include "dynarmic/backend/riscv64/a32_jitstate.h"
 #include "dynarmic/backend/riscv64/abi.h"
--- a/src/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.cpp
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -12,7 +12,6 @@
 #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"
@ -164,9 +163,8 @@ u32 RegAlloc::GenerateImmediate(const IR::Value& value) {
    } else if constexpr (kind == HostLoc::Kind::Fpr) {
        UNIMPLEMENTED();
    } else {
-        static_assert(Common::always_false_v<mcl::mp::lift_value<kind>>);
+        UNREACHABLE();
    }
-
    return 0;
 }

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

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

--- a/src/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.h
+++ b/src/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* 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 <mcl/type_traits/is_instance_of_template.hpp>
+#include "dynarmic/mcl/is_instance_of_template.hpp"
 #include <ankerl/unordered_dense.h>

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

--- a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cpp
@ -13,7 +13,7 @@

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

 #include "dynarmic/backend/x64/a32_emit_x64.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/a32_interface.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a32_interface.cpp
@ -14,7 +14,6 @@
 #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"

@ -77,12 +76,7 @@ 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;
@ -93,27 +87,19 @@ 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;
    }

--- a/src/dynarmic/src/dynarmic/backend/x64/a32_jitstate.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a32_jitstate.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* 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 <mcl/bit/bit_field.hpp>
+#include "dynarmic/mcl/bit.hpp"
 #include "dynarmic/common/common_types.h"

 #include "dynarmic/backend/x64/block_of_code.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp
@ -11,9 +11,8 @@
 #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 <mcl/type_traits/integer_of_size.hpp>
+#include "dynarmic/mcl/integer_of_size.hpp"
 #include <boost/container/static_vector.hpp>

 #include "dynarmic/backend/x64/a64_jitstate.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp
@ -13,7 +13,7 @@

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

 #include "dynarmic/backend/x64/a64_emit_x64.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp
@ -15,7 +15,6 @@
 #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"
@ -75,14 +74,8 @@ 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;
@ -92,27 +85,19 @@ 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;
    }

--- a/src/dynarmic/src/dynarmic/backend/x64/a64_jitstate.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a64_jitstate.cpp
@ -1,3 +1,6 @@
+// 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
@ -5,7 +8,7 @@

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

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

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

--- a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp
@ -25,7 +25,7 @@
 #include <cstring>

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

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

-#include <mcl/bit/bit_field.hpp>
+#include "dynarmic/mcl/bit.hpp"
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/backend/x64/xbyak.h"
 #include "dynarmic/backend/x64/abi.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/constants.h
+++ b/src/dynarmic/src/dynarmic/backend/x64/constants.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #include <optional>

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

 #include "dynarmic/common/fp/rounding_mode.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/devirtualize.h
+++ b/src/dynarmic/src/dynarmic/backend/x64/devirtualize.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

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

--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp
@ -12,8 +12,7 @@

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

--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h
+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h
@ -16,7 +16,7 @@
 #include <type_traits>
 #include <vector>

-#include <mcl/bitsizeof.hpp>
+#include "dynarmic/mcl/bit.hpp"
 #include <ankerl/unordered_dense.h>
 #include "dynarmic/backend/x64/xbyak.h"
 #include <boost/container/small_vector.hpp>
--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp
@ -11,14 +11,8 @@
 #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 <mcl/type_traits/integer_of_size.hpp>
+#include "dynarmic/mcl/integer_of_size.hpp"
 #include "dynarmic/backend/x64/xbyak.h"

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

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

 namespace {

--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.cpp.inc
+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.cpp.inc
@ -3,7 +3,8 @@
 * SPDX-License-Identifier: 0BSD
 */

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

 #define AxxEmitX64 CONCATENATE_TOKENS(Axx, EmitX64)
 #define AxxEmitContext CONCATENATE_TOKENS(Axx, EmitContext)
--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_saturation.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_saturation.cpp
@ -9,9 +9,9 @@
 #include <limits>

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

 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/backend/x64/emit_x64.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp
@ -13,11 +13,9 @@
 #include <type_traits>

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

 #include "dynarmic/backend/x64/abi.h"
--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp
@ -13,14 +13,8 @@
 #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 <mcl/type_traits/function_info.hpp>
-#include <mcl/type_traits/integer_of_size.hpp>
+#include "dynarmic/mcl/function_info.hpp"
+#include "dynarmic/mcl/integer_of_size.hpp"
 #include "dynarmic/backend/x64/xbyak.h"

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

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

 namespace {

@ -2000,6 +1993,7 @@ 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) {
--- a/src/dynarmic/src/dynarmic/backend/x64/perf_map.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/perf_map.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

-#include "dynarmic/backend/x64/perf_map.h"
-
 #include <cstddef>
 #include <string>
+#include <fmt/format.h>

+#include "dynarmic/backend/x64/perf_map.h"
+#include "dynarmic/common/common_types.h"
 #if defined(__linux__) && !defined(__ANDROID__)
 #    include <cstdio>
 #    include <cstdlib>
 #    include <mutex>
-#    include <fmt/format.h>
-#    include <mcl/stdint.hpp>
 #    include <sys/types.h>
 #    include <unistd.h>

--- a/src/dynarmic/src/dynarmic/common/cast_util.h
+++ b/src/dynarmic/src/dynarmic/common/cast_util.h
@ -1,3 +1,6 @@
+// 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) 2018 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -5,7 +8,7 @@

 #pragma once

-#include <mcl/type_traits/function_info.hpp>
+#include "dynarmic/mcl/function_info.hpp"

 namespace Dynarmic::Common {

--- a/src/dynarmic/src/dynarmic/common/fp/fpcr.h
+++ b/src/dynarmic/src/dynarmic/common/fp/fpcr.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/common/fp/rounding_mode.h"
--- a/src/dynarmic/src/dynarmic/common/fp/fpsr.h
+++ b/src/dynarmic/src/dynarmic/common/fp/fpsr.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #pragma once

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

 namespace Dynarmic::FP {
--- a/src/dynarmic/src/dynarmic/common/fp/fused.cpp
+++ b/src/dynarmic/src/dynarmic/common/fp/fused.cpp
@ -1,3 +1,6 @@
+// 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) 2018 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -5,7 +8,7 @@

 #include "dynarmic/common/fp/fused.h"

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

 #include "dynarmic/common/fp/unpacked.h"
 #include "dynarmic/common/u128.h"
--- a/src/dynarmic/src/dynarmic/common/fp/info.h
+++ b/src/dynarmic/src/dynarmic/common/fp/info.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #pragma once

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

 namespace Dynarmic::FP {
--- a/src/dynarmic/src/dynarmic/common/fp/mantissa_util.h
+++ b/src/dynarmic/src/dynarmic/common/fp/mantissa_util.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #pragma once

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

 namespace Dynarmic::FP {
--- a/src/dynarmic/src/dynarmic/common/fp/op/FPConvert.cpp
+++ b/src/dynarmic/src/dynarmic/common/fp/op/FPConvert.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #include "dynarmic/common/fp/op/FPConvert.h"

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

 #include "dynarmic/common/fp/fpcr.h"
--- a/src/dynarmic/src/dynarmic/common/fp/op/FPRecipExponent.cpp
+++ b/src/dynarmic/src/dynarmic/common/fp/op/FPRecipExponent.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #include "dynarmic/common/fp/op/FPRecipExponent.h"

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

 #include "dynarmic/common/fp/fpcr.h"
--- a/src/dynarmic/src/dynarmic/common/fp/op/FPRoundInt.cpp
+++ b/src/dynarmic/src/dynarmic/common/fp/op/FPRoundInt.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -9,7 +9,7 @@
 #include "dynarmic/common/fp/op/FPRoundInt.h"

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

 #include "dynarmic/common/fp/fpcr.h"
--- a/src/dynarmic/src/dynarmic/common/fp/op/FPToFixed.cpp
+++ b/src/dynarmic/src/dynarmic/common/fp/op/FPToFixed.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/common/fp/fpcr.h"
--- a/src/dynarmic/src/dynarmic/common/fp/process_nan.cpp
+++ b/src/dynarmic/src/dynarmic/common/fp/process_nan.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/src/dynarmic/src/dynarmic/common/fp/unpacked.cpp
+++ b/src/dynarmic/src/dynarmic/common/fp/unpacked.cpp
@ -1,3 +1,6 @@
+// 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) 2018 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -7,8 +10,7 @@

 #include <algorithm>

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

 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/common/fp/info.h"
--- a/src/dynarmic/src/dynarmic/common/fp/unpacked.h
+++ b/src/dynarmic/src/dynarmic/common/fp/unpacked.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #include <tuple>

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

 #include "dynarmic/common/fp/fpcr.h"
--- a/src/dynarmic/src/dynarmic/common/safe_ops.h
+++ b/src/dynarmic/src/dynarmic/common/safe_ops.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #include <type_traits>

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

 #include "dynarmic/common/u128.h"
--- a/src/dynarmic/src/dynarmic/common/u128.h
+++ b/src/dynarmic/src/dynarmic/common/u128.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -11,8 +11,7 @@
 #include <tuple>
 #include <type_traits>

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

 namespace Dynarmic {
--- a/src/dynarmic/src/dynarmic/frontend/A32/FPSCR.h
+++ b/src/dynarmic/src/dynarmic/frontend/A32/FPSCR.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #include <optional>

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

 #include "dynarmic/common/fp/rounding_mode.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/ITState.h
+++ b/src/dynarmic/src/dynarmic/frontend/A32/ITState.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #pragma once

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

 #include "dynarmic/ir/cond.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/PSR.h
+++ b/src/dynarmic/src/dynarmic/frontend/A32/PSR.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

 #pragma once

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

 #include "dynarmic/frontend/A32/ITState.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/a32_types.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/a32_types.cpp
@ -1,3 +1,6 @@
+// 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 +11,7 @@
 #include <array>
 #include <ostream>

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

 namespace Dynarmic::A32 {

--- a/src/dynarmic/src/dynarmic/frontend/A32/decoder/arm.h
+++ b/src/dynarmic/src/dynarmic/frontend/A32/decoder/arm.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/frontend/decoder/decoder_detail.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/decoder/asimd.h
+++ b/src/dynarmic/src/dynarmic/frontend/A32/decoder/asimd.h
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -15,7 +15,7 @@
 #include <vector>
 #include <iterator>

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

 #include "dynarmic/frontend/decoder/decoder_detail.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/conditional_state.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/conditional_state.cpp
@ -32,8 +32,7 @@ bool CondCanContinue(const ConditionalState cond_state, const A32::IREmitter& ir
 }

 bool IsConditionPassed(TranslatorVisitor& v, IR::Cond cond) {
-    ASSERT_MSG(v.cond_state != ConditionalState::Break,
-               "This should never happen. We requested a break but that wasn't honored.");
+    ASSERT(v.cond_state != ConditionalState::Break && "This should never happen. We requested a break but that wasn't honored.");

    if (cond == IR::Cond::NV) {
        // NV conditional is obsolete
--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/a32_branch.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/a32_branch.cpp
@ -1,9 +1,12 @@
+// 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
 */

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.h
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.h
@ -9,8 +9,7 @@
 #pragma once

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

 #include "dynarmic/frontend/A32/a32_ir_emitter.h"
 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /* This file is part of the dynarmic project.
@ -9,8 +9,7 @@
 #include <vector>

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp
@ -1,9 +1,12 @@
+// 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) 2020 MerryMage
 * SPDX-License-Identifier: 0BSD
 */

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/frontend/A32/translate/impl/common.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp
@ -1,3 +1,6 @@
+// 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) 2020 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -5,7 +8,7 @@

 #include <array>

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/frontend/A32/translate/impl/common.h"
--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/load_store.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/load_store.cpp
@ -6,8 +6,7 @@
 * SPDX-License-Identifier: 0BSD
 */

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/misc.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/misc.cpp
@ -1,9 +1,12 @@
+// 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
 */

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp
@ -6,7 +6,7 @@
 * SPDX-License-Identifier: 0BSD
 */

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"

--- a/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

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

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

 #include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/interface/A32/config.h"
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
lizzie	fe5fd4d0ce	forgot comma... haha	2026-03-27 01:17:38 +01:00
lizzie	c5d53b20c2	androiiii	2026-03-27 01:17:38 +01:00
lizzie	f870aa1f2d	default=1	2026-03-27 01:17:38 +01:00
lizzie	a6d507f910	[settings] modify reported product_model Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-03-27 01:17:38 +01:00
lizzie	47c6a73971	[dynarmic] nuke mcl dependency (#3777 ) Some checks are pending tx-src / sources (push) Waiting to run Details Check Strings / check-strings (push) Waiting to run Details crueter will love this one mcl nuked off externals, i did however copy some important headers (notably intrusive list and bit.hpp); because grand part of dynarmic still uses them but i made the appropriate adjustments anyways solves mcl for #3373 depends on #3718 Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3777 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>	2026-03-27 01:11:49 +01:00
PavelBARABANOV	813a35abca	[vi] Restore high Z-index for shared buffer layer to fix keyboard overlay display (#3787 ) Some checks are pending tx-src / sources (push) Waiting to run Details Check Strings / check-strings (push) Waiting to run Details Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3787 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: Lizzie <lizzie@eden-emu.dev> Co-authored-by: PavelBARABANOV <pavelbarabanov94@gmail.com> Co-committed-by: PavelBARABANOV <pavelbarabanov94@gmail.com>	2026-03-26 22:23:21 +01:00
crueter	93472023e2	[cmake] Fix macOS frameworks, and icon set usage (#3782 ) Some checks are pending tx-src / sources (push) Waiting to run Details Check Strings / check-strings (push) Waiting to run Details - The Xcode generator /mandates/ that you pass in the `.icon` directory into the build system, where it can then compose the asset itself. - Assets.car and eden.icns were improperly handled; they are now automatically generated and should properly be applied as needed. I will need someone on Tahoe to confirm, however, as I am on Sequoia. - Added some missing frameworks, ported from the KosmicKrisp branch. Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3782	2026-03-26 07:59:53 +01:00