fix: reset submodules to match master and remove ffmpeg submodule

2025-07-30 15:21:30 +02:00 · 2025-07-30 15:21:30 +02:00 · 6f31a10699
commit 6f31a10699
parent 840aae1671
215 changed files with 4744 additions and 5048 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -49,6 +49,9 @@
 [submodule "externals/dynarmic/externals/zydis"]
 	path = externals/dynarmic/externals/zydis
 	url = https://github.com/zyantific/zydis.git
+[submodule "externals/dynarmic/externals/xbyak"]
+	path = externals/dynarmic/externals/xbyak
+	url = https://github.com/herumi/xbyak.git
 [submodule "externals/nx_tzdb/tzdb_to_nx/externals/tz/tz"]
 	path = externals/nx_tzdb/tzdb_to_nx/externals/tz/tz
 	url = https://github.com/eggert/tz.git
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -83,23 +83,7 @@ if (YUZU_USE_EXTERNAL_SDL2)
        set(SDL_FILE ON)
    endif()

-    include(CPM)
-    set(CPM_USE_LOCAL_PACKAGES OFF)
-
-    if ("${YUZU_SYSTEM_PROFILE}" STREQUAL "steamdeck")
-        set(SDL_HASH cc016b0046)
-        set(SDL_PIPEWIRE OFF) # build errors out with this on
-        set(SDL_SHA512SUM 34d5ef58da6a4f9efa6689c82f67badcbd741f5a4f562a9c2c30828fa839830fb07681c5dc6a7851520e261c8405a416ac0a2c2513b51984fb3b4fa4dcb3e20b)
-    else()
-        set(SDL_HASH 2e4c12cd2c)
-        set(SDL_SHA512SUM d95af47f469a312876f8ab361074a1e7b8083db19935a102d9c6e5887ace6008e64475a8c54b00164b40cad86492bb1b2366084efdd0b2555e5fea6d9c5da80e)
-    endif()
-
-    CPMAddPackage(
-            NAME SDL2
-            URL "https://github.com/libsdl-org/SDL/archive/${SDL_HASH}.zip"
-            URL_HASH SHA512=${SDL_SHA512SUM}
-        )
+    add_subdirectory(SDL)
 endif()

 # ENet
@ -227,7 +211,7 @@ if (ANDROID)
   endif()
 endif()

-if ((CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID) AND NOT TARGET gamemode::headers)
+if (UNIX AND NOT APPLE AND NOT TARGET gamemode::headers)
    add_library(gamemode INTERFACE)
    target_include_directories(gamemode INTERFACE gamemode)
    add_library(gamemode::headers ALIAS gamemode)
--- a/externals/SDL
+++ b/externals/SDL
@ -0,0 +1 @@
+Subproject commit 2e4c12cd2cb2c5d0b60ef2196b400339591e733c
--- a/externals/dynarmic/CMakeLists.txt
+++ b/externals/dynarmic/CMakeLists.txt
@ -98,7 +98,8 @@ else()
        -Wextra
        -Wcast-qual
        -pedantic
-        -Wno-missing-braces)
+        -Wno-missing-braces
+        -Wstack-usage=4096)

    if (ARCHITECTURE STREQUAL "x86_64")
        list(APPEND DYNARMIC_CXX_FLAGS -mtune=core2)
@ -122,15 +123,12 @@ else()
        # GCC knows that the variable is actually a Reg64.  isMEM() will never return true for a
        # Reg64, but GCC doesn't know that.
        list(APPEND DYNARMIC_CXX_FLAGS -Wno-array-bounds)
-        list(APPEND DYNARMIC_CXX_FLAGS -Wstack-usage=4096)
    endif()

    if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
        # Bracket depth determines maximum size of a fold expression in Clang since 9c9974c3ccb6.
        # And this in turns limits the size of a std::array.
        list(APPEND DYNARMIC_CXX_FLAGS -fbracket-depth=1024)
-        # Clang mistakenly blames CMake for using unused arguments during compilation
-        list(APPEND DYNARMIC_CXX_FLAGS -Wno-unused-command-line-argument)
    endif()
 endif()

--- a/externals/dynarmic/externals/CMakeLists.txt
+++ b/externals/dynarmic/externals/CMakeLists.txt
@ -64,13 +64,12 @@ if (NOT TARGET ankerl::unordered_dense)
 endif()

 # xbyak
-# uncomment if in an independent repo.

-# if (NOT TARGET xbyak::xbyak)
-#     if ("x86_64" IN_LIST ARCHITECTURE)
-#         add_subdirectory(xbyak)
-#     endif()
-# endif()
+if (NOT TARGET xbyak::xbyak)
+    if ("x86_64" IN_LIST ARCHITECTURE)
+        add_subdirectory(xbyak)
+    endif()
+endif()

 # zydis

--- a/externals/dynarmic/src/dynarmic/CMakeLists.txt
+++ b/externals/dynarmic/src/dynarmic/CMakeLists.txt
@ -5,10 +5,7 @@ add_library(dynarmic
    backend/block_range_information.h
    backend/exception_handler.h
    common/always_false.h
-    common/assert.cpp
-    common/assert.h
    common/cast_util.h
-    common/common_types.h
    common/crypto/aes.cpp
    common/crypto/aes.h
    common/crypto/crc32.cpp
@ -128,6 +125,52 @@ if ("A32" IN_LIST DYNARMIC_FRONTENDS)
        frontend/A32/translate/a32_translate.h
        frontend/A32/translate/conditional_state.cpp
        frontend/A32/translate/conditional_state.h
+        frontend/A32/translate/impl/a32_branch.cpp
+        frontend/A32/translate/impl/a32_crc32.cpp
+        frontend/A32/translate/impl/a32_exception_generating.cpp
+        frontend/A32/translate/impl/a32_translate_impl.cpp
+        frontend/A32/translate/impl/a32_translate_impl.h
+        frontend/A32/translate/impl/asimd_load_store_structures.cpp
+        frontend/A32/translate/impl/asimd_misc.cpp
+        frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp
+        frontend/A32/translate/impl/asimd_three_regs.cpp
+        frontend/A32/translate/impl/asimd_two_regs_misc.cpp
+        frontend/A32/translate/impl/asimd_two_regs_scalar.cpp
+        frontend/A32/translate/impl/asimd_two_regs_shift.cpp
+        frontend/A32/translate/impl/barrier.cpp
+        frontend/A32/translate/impl/coprocessor.cpp
+        frontend/A32/translate/impl/data_processing.cpp
+        frontend/A32/translate/impl/divide.cpp
+        frontend/A32/translate/impl/extension.cpp
+        frontend/A32/translate/impl/hint.cpp
+        frontend/A32/translate/impl/load_store.cpp
+        frontend/A32/translate/impl/misc.cpp
+        frontend/A32/translate/impl/multiply.cpp
+        frontend/A32/translate/impl/packing.cpp
+        frontend/A32/translate/impl/parallel.cpp
+        frontend/A32/translate/impl/reversal.cpp
+        frontend/A32/translate/impl/saturated.cpp
+        frontend/A32/translate/impl/status_register_access.cpp
+        frontend/A32/translate/impl/synchronization.cpp
+        frontend/A32/translate/impl/thumb16.cpp
+        frontend/A32/translate/impl/thumb32_branch.cpp
+        frontend/A32/translate/impl/thumb32_control.cpp
+        frontend/A32/translate/impl/thumb32_coprocessor.cpp
+        frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp
+        frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp
+        frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+        frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp
+        frontend/A32/translate/impl/thumb32_load_byte.cpp
+        frontend/A32/translate/impl/thumb32_load_halfword.cpp
+        frontend/A32/translate/impl/thumb32_load_store_dual.cpp
+        frontend/A32/translate/impl/thumb32_load_store_multiple.cpp
+        frontend/A32/translate/impl/thumb32_load_word.cpp
+        frontend/A32/translate/impl/thumb32_long_multiply.cpp
+        frontend/A32/translate/impl/thumb32_misc.cpp
+        frontend/A32/translate/impl/thumb32_multiply.cpp
+        frontend/A32/translate/impl/thumb32_parallel.cpp
+        frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
+        frontend/A32/translate/impl/vfp.cpp
        frontend/A32/translate/translate_arm.cpp
        frontend/A32/translate/translate_thumb.cpp
        interface/A32/a32.h
@ -151,6 +194,65 @@ if ("A64" IN_LIST DYNARMIC_FRONTENDS)
        frontend/A64/decoder/a64.inc
        frontend/A64/translate/a64_translate.cpp
        frontend/A64/translate/a64_translate.h
+        frontend/A64/translate/impl/a64_branch.cpp
+        frontend/A64/translate/impl/a64_exception_generating.cpp
+        frontend/A64/translate/impl/data_processing_addsub.cpp
+        frontend/A64/translate/impl/data_processing_bitfield.cpp
+        frontend/A64/translate/impl/data_processing_conditional_compare.cpp
+        frontend/A64/translate/impl/data_processing_conditional_select.cpp
+        frontend/A64/translate/impl/data_processing_crc32.cpp
+        frontend/A64/translate/impl/data_processing_logical.cpp
+        frontend/A64/translate/impl/data_processing_multiply.cpp
+        frontend/A64/translate/impl/data_processing_pcrel.cpp
+        frontend/A64/translate/impl/data_processing_register.cpp
+        frontend/A64/translate/impl/data_processing_shift.cpp
+        frontend/A64/translate/impl/floating_point_compare.cpp
+        frontend/A64/translate/impl/floating_point_conditional_compare.cpp
+        frontend/A64/translate/impl/floating_point_conditional_select.cpp
+        frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp
+        frontend/A64/translate/impl/floating_point_conversion_integer.cpp
+        frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp
+        frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp
+        frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp
+        frontend/A64/translate/impl/impl.cpp
+        frontend/A64/translate/impl/impl.h
+        frontend/A64/translate/impl/load_store_exclusive.cpp
+        frontend/A64/translate/impl/load_store_load_literal.cpp
+        frontend/A64/translate/impl/load_store_multiple_structures.cpp
+        frontend/A64/translate/impl/load_store_no_allocate_pair.cpp
+        frontend/A64/translate/impl/load_store_register_immediate.cpp
+        frontend/A64/translate/impl/load_store_register_pair.cpp
+        frontend/A64/translate/impl/load_store_register_register_offset.cpp
+        frontend/A64/translate/impl/load_store_register_unprivileged.cpp
+        frontend/A64/translate/impl/load_store_single_structure.cpp
+        frontend/A64/translate/impl/move_wide.cpp
+        frontend/A64/translate/impl/simd_across_lanes.cpp
+        frontend/A64/translate/impl/simd_aes.cpp
+        frontend/A64/translate/impl/simd_copy.cpp
+        frontend/A64/translate/impl/simd_crypto_four_register.cpp
+        frontend/A64/translate/impl/simd_crypto_three_register.cpp
+        frontend/A64/translate/impl/simd_extract.cpp
+        frontend/A64/translate/impl/simd_modified_immediate.cpp
+        frontend/A64/translate/impl/simd_permute.cpp
+        frontend/A64/translate/impl/simd_scalar_pairwise.cpp
+        frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp
+        frontend/A64/translate/impl/simd_scalar_three_same.cpp
+        frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp
+        frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp
+        frontend/A64/translate/impl/simd_sha.cpp
+        frontend/A64/translate/impl/simd_sha512.cpp
+        frontend/A64/translate/impl/simd_shift_by_immediate.cpp
+        frontend/A64/translate/impl/simd_table_lookup.cpp
+        frontend/A64/translate/impl/simd_three_different.cpp
+        frontend/A64/translate/impl/simd_three_same.cpp
+        frontend/A64/translate/impl/simd_three_same_extra.cpp
+        frontend/A64/translate/impl/simd_two_register_misc.cpp
+        frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp
+        frontend/A64/translate/impl/sys_dc.cpp
+        frontend/A64/translate/impl/sys_ic.cpp
+        frontend/A64/translate/impl/system.cpp
+        frontend/A64/translate/impl/system_flag_format.cpp
+        frontend/A64/translate/impl/system_flag_manipulation.cpp
        interface/A64/a64.h
        interface/A64/config.h
        ir/opt/a64_callback_config_pass.cpp
--- a/externals/dynarmic/src/dynarmic/backend/arm64/a32_interface.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/a32_interface.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2021 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -10,9 +7,9 @@
 #include <mutex>

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

 #include "dynarmic/backend/arm64/a32_address_space.h"
 #include "dynarmic/backend/arm64/a32_core.h"
--- a/externals/dynarmic/src/dynarmic/backend/arm64/a32_jitstate.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/a32_jitstate.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,7 +6,7 @@
 #include "dynarmic/backend/arm64/a32_jitstate.h"

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

 namespace Dynarmic::Backend::Arm64 {

--- a/externals/dynarmic/src/dynarmic/backend/arm64/a32_jitstate.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/a32_jitstate.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2021 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -10,7 +7,7 @@

 #include <array>

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

 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/ir/location_descriptor.h"
--- a/externals/dynarmic/src/dynarmic/backend/arm64/a64_interface.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/a64_interface.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,9 +7,9 @@
 #include <mutex>

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

 #include "dynarmic/backend/arm64/a64_address_space.h"
 #include "dynarmic/backend/arm64/a64_core.h"
--- a/externals/dynarmic/src/dynarmic/backend/arm64/a64_jitstate.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/a64_jitstate.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

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

--- a/externals/dynarmic/src/dynarmic/backend/arm64/abi.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/abi.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <vector>

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

 namespace Dynarmic::Backend::Arm64 {
--- a/externals/dynarmic/src/dynarmic/backend/arm64/abi.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/abi.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -13,7 +10,7 @@
 #include <type_traits>

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

 #include "dynarmic/common/always_false.h"
@ -62,12 +59,13 @@ constexpr RegisterList ToRegList(oaknut::Reg reg) {
    }

    if (reg.index() == 31) {
-        ASSERT_FALSE("ZR not allowed in reg list");
+        throw std::out_of_range("ZR not allowed in reg list");
    }

    if (reg.index() == -1) {
        return RegisterList{1} << 31;
    }
+
    return RegisterList{1} << reg.index();
 }

--- a/externals/dynarmic/src/dynarmic/backend/arm64/address_space.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/address_space.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <map>
 #include <optional>

-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <oaknut/code_block.hpp>
 #include <oaknut/oaknut.hpp>
 #include <ankerl/unordered_dense.h>
--- a/externals/dynarmic/src/dynarmic/backend/arm64/devirtualize.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/devirtualize.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,7 +6,7 @@
 #pragma once

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

 namespace Dynarmic::Backend::Arm64 {
--- a/externals/dynarmic/src/dynarmic/backend/arm64/emit_arm64.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/emit_arm64.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -13,7 +10,7 @@
 #include <memory>
 #include <vector>

-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <ankerl/unordered_dense.h>

 #include "dynarmic/backend/arm64/fastmem.h"
--- a/externals/dynarmic/src/dynarmic/backend/arm64/emit_arm64_memory.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/emit_arm64_memory.h
@ -1,12 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 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 "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>

 namespace oaknut {
 struct CodeGenerator;
--- a/externals/dynarmic/src/dynarmic/backend/arm64/exclusive_monitor.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/exclusive_monitor.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <algorithm>

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

 namespace Dynarmic {

--- a/externals/dynarmic/src/dynarmic/backend/arm64/fastmem.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/fastmem.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,7 +9,7 @@
 #include <tuple>

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

 #include "dynarmic/backend/exception_handler.h"
--- a/externals/dynarmic/src/dynarmic/backend/arm64/fpsr_manager.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/fpsr_manager.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

 #pragma once

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

 namespace oaknut {
 struct CodeGenerator;
--- a/externals/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,11 +9,11 @@
 #include <array>
 #include <iterator>

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

 #include "dynarmic/backend/arm64/abi.h"
 #include "dynarmic/backend/arm64/emit_context.h"
--- a/externals/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -14,8 +11,8 @@
 #include <utility>
 #include <vector>

-#include "dynarmic/common/assert.h"
-#include "dynarmic/common/common_types.h"
+#include <mcl/assert.hpp>
+#include <mcl/stdint.hpp>
 #include <mcl/type_traits/is_instance_of_template.hpp>
 #include <oaknut/oaknut.hpp>
 #include <ankerl/unordered_dense.h>
--- a/externals/dynarmic/src/dynarmic/backend/arm64/stack_layout.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/stack_layout.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Backend::Arm64 {

--- a/externals/dynarmic/src/dynarmic/backend/arm64/verbose_debugging_output.h
+++ b/externals/dynarmic/src/dynarmic/backend/arm64/verbose_debugging_output.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2023 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -10,7 +7,7 @@

 #include <array>

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

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

--- a/externals/dynarmic/src/dynarmic/backend/block_range_information.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/block_range_information.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <boost/icl/interval_map.hpp>
 #include <boost/icl/interval_set.hpp>
-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <ankerl/unordered_dense.h>

 namespace Dynarmic::Backend {
--- a/externals/dynarmic/src/dynarmic/backend/exception_handler.h
+++ b/externals/dynarmic/src/dynarmic/backend/exception_handler.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -13,7 +10,7 @@
 #include <optional>

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

 #if defined(MCL_ARCHITECTURE_X86_64)
 namespace Dynarmic::Backend::X64 {
--- a/externals/dynarmic/src/dynarmic/backend/exception_handler_macos.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/exception_handler_macos.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2019 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -18,10 +15,10 @@
 #include <vector>

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

 #include "dynarmic/backend/exception_handler.h"

--- a/externals/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2019 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -16,9 +13,6 @@
 #    ifndef __OpenBSD__
 #        include <ucontext.h>
 #    endif
-#    ifdef __sun__
-#        include <sys/regset.h>
-#    endif
 #endif

 #include <cstring>
@ -28,9 +22,9 @@
 #include <optional>
 #include <vector>

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

 #if defined(MCL_ARCHITECTURE_X86_64)
 #    include "dynarmic/backend/x64/block_of_code.h"
@ -151,9 +145,9 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) {

 #ifndef MCL_ARCHITECTURE_RISCV
    ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(raw_context);
-#ifndef __OpenBSD__
+#    ifndef __OpenBSD__
    auto& mctx = ucontext->uc_mcontext;
-#endif
+#    endif
 #endif

 #if defined(MCL_ARCHITECTURE_X86_64)
@ -173,9 +167,6 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) {
 #    elif defined(__OpenBSD__)
 #        define CTX_RIP (ucontext->sc_rip)
 #        define CTX_RSP (ucontext->sc_rsp)
-#    elif defined(__sun__)
-#        define CTX_RIP (mctx.gregs[REG_RIP])
-#        define CTX_RSP (mctx.gregs[REG_RSP])
 #    else
 #        error "Unknown platform"
 #    endif
--- a/externals/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

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

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

 #include "dynarmic/backend/riscv64/abi.h"
 #include "dynarmic/backend/riscv64/emit_riscv64.h"
--- a/externals/dynarmic/src/dynarmic/backend/riscv64/a32_interface.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/a32_interface.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,9 +7,9 @@
 #include <mutex>

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

 #include "dynarmic/backend/riscv64/a32_address_space.h"
 #include "dynarmic/backend/riscv64/a32_core.h"
--- a/externals/dynarmic/src/dynarmic/backend/riscv64/a32_jitstate.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/a32_jitstate.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,7 +6,7 @@
 #include "dynarmic/backend/riscv64/a32_jitstate.h"

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

 namespace Dynarmic::Backend::RV64 {

--- a/externals/dynarmic/src/dynarmic/backend/riscv64/a32_jitstate.h
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/a32_jitstate.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/ir/location_descriptor.h"
--- a/externals/dynarmic/src/dynarmic/backend/riscv64/code_block.h
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/code_block.h
@ -14,26 +14,29 @@ namespace Dynarmic::Backend::RV64 {

 class CodeBlock {
 public:
-    explicit CodeBlock(std::size_t size) noexcept : memsize(size) {
+    explicit CodeBlock(std::size_t size)
+            : memsize(size) {
        mem = (u8*)mmap(nullptr, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
+
        if (mem == nullptr)
-            ASSERT_FALSE("out of memory");
+            throw std::bad_alloc{};
    }

-    ~CodeBlock() noexcept {
+    ~CodeBlock() {
        if (mem == nullptr)
            return;
+
        munmap(mem, memsize);
    }

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

 protected:
-    u8* mem = nullptr;
+    u8* mem;
    size_t memsize = 0;
 };
 }  // namespace Dynarmic::Backend::RV64
--- a/externals/dynarmic/src/dynarmic/backend/riscv64/emit_riscv64.h
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/emit_riscv64.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <vector>

 #include <biscuit/label.hpp>
-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>

 namespace biscuit {
 class Assembler;
--- a/externals/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,9 +8,9 @@
 #include <algorithm>
 #include <array>

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

 #include "dynarmic/common/always_false.h"

--- a/externals/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.h
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -16,8 +13,8 @@

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

--- a/externals/dynarmic/src/dynarmic/backend/riscv64/stack_layout.h
+++ b/externals/dynarmic/src/dynarmic/backend/riscv64/stack_layout.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Backend::RV64 {

--- a/externals/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -14,10 +11,10 @@

 #include <fmt/format.h>
 #include <fmt/ostream.h>
-#include "dynarmic/common/assert.h"
+#include <mcl/assert.hpp>
 #include <mcl/bit/bit_field.hpp>
 #include <mcl/scope_exit.hpp>
-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <boost/container/static_vector.hpp>

 #include "dynarmic/backend/x64/a32_jitstate.h"
@ -127,36 +124,35 @@ A32EmitX64::BlockDescriptor A32EmitX64::Emit(IR::Block& block) {

    EmitCondPrelude(ctx);

-    auto const loop_all_inst = [this, &block, &ctx](auto const func) {
-        for (auto iter = block.begin(); iter != block.end(); ++iter) [[likely]] {
-            auto* inst = &*iter;
-            // Call the relevant Emit* member function.
-            switch (inst->GetOpcode()) {
-#define OPCODE(name, type, ...)                     \
-            case IR::Opcode::name:                  \
-                A32EmitX64::Emit##name(ctx, inst);  \
-                break;
-#define A32OPC(name, type, ...)                     \
-            case IR::Opcode::A32##name:             \
-                A32EmitX64::EmitA32##name(ctx, inst);\
-                break;
+    for (auto iter = block.begin(); iter != block.end(); ++iter) {
+        IR::Inst* inst = &*iter;
+
+        // Call the relevant Emit* member function.
+        switch (inst->GetOpcode()) {
+#define OPCODE(name, type, ...)            \
+    case IR::Opcode::name:                 \
+        A32EmitX64::Emit##name(ctx, inst); \
+        break;
+#define A32OPC(name, type, ...)               \
+    case IR::Opcode::A32##name:               \
+        A32EmitX64::EmitA32##name(ctx, inst); \
+        break;
 #define A64OPC(...)
 #include "dynarmic/ir/opcodes.inc"
 #undef OPCODE
 #undef A32OPC
 #undef A64OPC
-            default: [[unlikely]] ASSERT_FALSE("Invalid opcode: {}", inst->GetOpcode());
-            }
-            reg_alloc.EndOfAllocScope();
-            func(reg_alloc);
+
+        default:
+            ASSERT_FALSE("Invalid opcode: {}", inst->GetOpcode());
+            break;
        }
-    };
-    if (!conf.very_verbose_debugging_output) [[likely]] {
-        loop_all_inst([](auto&) { /*noop*/ });
-    } else [[unlikely]] {
-        loop_all_inst([this](auto& reg_alloc) {
+
+        reg_alloc.EndOfAllocScope();
+
+        if (conf.very_verbose_debugging_output) {
            EmitVerboseDebuggingOutput(reg_alloc);
-        });
+        }
    }

    reg_alloc.AssertNoMoreUses();
@ -233,7 +229,7 @@ void A32EmitX64::GenTerminalHandlers() {
    terminal_handler_pop_rsb_hint = code.getCurr<const void*>();
    calculate_location_descriptor();
    code.mov(eax, dword[r15 + offsetof(A32JitState, rsb_ptr)]);
-    code.dec(eax);
+    code.sub(eax, 1);
    code.and_(eax, u32(A32JitState::RSBPtrMask));
    code.mov(dword[r15 + offsetof(A32JitState, rsb_ptr)], eax);
    code.cmp(rbx, qword[r15 + offsetof(A32JitState, rsb_location_descriptors) + rax * sizeof(u64)]);
--- a/externals/dynarmic/src/dynarmic/backend/x64/a32_interface.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a32_interface.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,10 +9,10 @@

 #include <boost/icl/interval_set.hpp>
 #include <fmt/format.h>
-#include "dynarmic/common/assert.h"
+#include <mcl/assert.hpp>
 #include <mcl/bit_cast.hpp>
 #include <mcl/scope_exit.hpp>
-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>

 #include "dynarmic/backend/x64/a32_emit_x64.h"
 #include "dynarmic/backend/x64/a32_jitstate.h"
--- a/externals/dynarmic/src/dynarmic/backend/x64/a32_jitstate.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a32_jitstate.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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,9 +5,9 @@

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

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

 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/backend/x64/nzcv_util.h"
--- a/externals/dynarmic/src/dynarmic/backend/x64/a32_jitstate.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a32_jitstate.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Backend::X64 {

--- a/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,9 +7,9 @@

 #include <fmt/format.h>
 #include <fmt/ostream.h>
-#include "dynarmic/common/assert.h"
+#include <mcl/assert.hpp>
 #include <mcl/scope_exit.hpp>
-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <mcl/type_traits/integer_of_size.hpp>
 #include <boost/container/static_vector.hpp>

@ -201,19 +198,18 @@ void A64EmitX64::GenTerminalHandlers() {
        code.or_(rbx, rcx);
    };

-    Xbyak::Label fast_dispatch_cache_miss;
-    Xbyak::Label rsb_cache_miss;
+    Xbyak::Label fast_dispatch_cache_miss, rsb_cache_miss;

    code.align();
    terminal_handler_pop_rsb_hint = code.getCurr<const void*>();
    calculate_location_descriptor();
    code.mov(eax, dword[r15 + offsetof(A64JitState, rsb_ptr)]);
-    code.dec(eax);
+    code.sub(eax, 1);
    code.and_(eax, u32(A64JitState::RSBPtrMask));
    code.mov(dword[r15 + offsetof(A64JitState, rsb_ptr)], eax);
    code.cmp(rbx, qword[r15 + offsetof(A64JitState, rsb_location_descriptors) + rax * sizeof(u64)]);
    if (conf.HasOptimization(OptimizationFlag::FastDispatch)) {
-        code.jne(rsb_cache_miss, code.T_NEAR);
+        code.jne(rsb_cache_miss);
    } else {
        code.jne(code.GetReturnFromRunCodeAddress());
    }
--- a/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp
@ -33,13 +33,13 @@ void A64EmitX64::GenMemory128Accessors() {
 #ifdef _WIN32
    Devirtualize<&A64::UserCallbacks::MemoryRead128>(conf.callbacks).EmitCallWithReturnPointer(code, [&](Xbyak::Reg64 return_value_ptr, [[maybe_unused]] RegList args) {
        code.mov(code.ABI_PARAM3, code.ABI_PARAM2);
-        code.lea(rsp, ptr[rsp - (8 + 16 + ABI_SHADOW_SPACE)]);
+        code.sub(rsp, 8 + 16 + ABI_SHADOW_SPACE);
        code.lea(return_value_ptr, ptr[rsp + ABI_SHADOW_SPACE]);
    });
    code.movups(xmm1, xword[code.ABI_RETURN]);
    code.add(rsp, 8 + 16 + ABI_SHADOW_SPACE);
 #else
-    code.lea(rsp, ptr[rsp - 8]);
+    code.sub(rsp, 8);
    Devirtualize<&A64::UserCallbacks::MemoryRead128>(conf.callbacks).EmitCall(code);
    if (code.HasHostFeature(HostFeature::SSE41)) {
        code.movq(xmm1, code.ABI_RETURN);
@ -57,13 +57,13 @@ void A64EmitX64::GenMemory128Accessors() {
    code.align();
    memory_write_128 = code.getCurr<void (*)()>();
 #ifdef _WIN32
-    code.lea(rsp, ptr[rsp - (8 + 16 + ABI_SHADOW_SPACE)]);
+    code.sub(rsp, 8 + 16 + ABI_SHADOW_SPACE);
    code.lea(code.ABI_PARAM3, ptr[rsp + ABI_SHADOW_SPACE]);
    code.movaps(xword[code.ABI_PARAM3], xmm1);
    Devirtualize<&A64::UserCallbacks::MemoryWrite128>(conf.callbacks).EmitCall(code);
    code.add(rsp, 8 + 16 + ABI_SHADOW_SPACE);
 #else
-    code.lea(rsp, ptr[rsp - 8]);
+    code.sub(rsp, 8);
    if (code.HasHostFeature(HostFeature::SSE41)) {
        code.movq(code.ABI_PARAM3, xmm1);
        code.pextrq(code.ABI_PARAM4, xmm1, 1);
@ -81,7 +81,7 @@ void A64EmitX64::GenMemory128Accessors() {
    code.align();
    memory_exclusive_write_128 = code.getCurr<void (*)()>();
 #ifdef _WIN32
-    code.lea(rsp, ptr[rsp - (8 + 32 + ABI_SHADOW_SPACE)]);
+    code.sub(rsp, 8 + 32 + ABI_SHADOW_SPACE);
    code.lea(code.ABI_PARAM3, ptr[rsp + ABI_SHADOW_SPACE]);
    code.lea(code.ABI_PARAM4, ptr[rsp + ABI_SHADOW_SPACE + 16]);
    code.movaps(xword[code.ABI_PARAM3], xmm1);
@ -89,7 +89,7 @@ void A64EmitX64::GenMemory128Accessors() {
    Devirtualize<&A64::UserCallbacks::MemoryWriteExclusive128>(conf.callbacks).EmitCall(code);
    code.add(rsp, 8 + 32 + ABI_SHADOW_SPACE);
 #else
-    code.lea(rsp, ptr[rsp - 8]);
+    code.sub(rsp, 8);
    if (code.HasHostFeature(HostFeature::SSE41)) {
        code.movq(code.ABI_PARAM3, xmm1);
        code.pextrq(code.ABI_PARAM4, xmm1, 1);
@ -131,8 +131,8 @@ void A64EmitX64::GenFastmemFallbacks() {
        {64, Devirtualize<&A64::UserCallbacks::MemoryWriteExclusive64>(conf.callbacks)},
    }};

-    for (auto const ordered : {false, true}) {
-        for (auto const vaddr_idx : idxes) {
+    for (bool ordered : {false, true}) {
+        for (int vaddr_idx : idxes) {
            if (vaddr_idx == 4 || vaddr_idx == 15) {
                continue;
            }
--- a/externals/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <mutex>

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

--- a/externals/dynarmic/src/dynarmic/backend/x64/a64_jitstate.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/a64_jitstate.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 #include "dynarmic/backend/x64/nzcv_util.h"
 #include "dynarmic/frontend/A64/a64_location_descriptor.h"
--- a/externals/dynarmic/src/dynarmic/backend/x64/abi.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/abi.cpp
@ -11,7 +11,7 @@
 #include <algorithm>

 #include <mcl/iterator/reverse.hpp>
-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <xbyak/xbyak.h>

 #include "dynarmic/backend/x64/block_of_code.h"
--- a/externals/dynarmic/src/dynarmic/backend/x64/abi.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/abi.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,7 +6,7 @@

 #include <array>

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

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

--- a/externals/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -24,7 +21,7 @@
 #include <array>
 #include <cstring>

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

@ -66,8 +63,7 @@ public:
    uint8_t* alloc(size_t size) override {
        void* p = VirtualAlloc(nullptr, size, MEM_RESERVE, PAGE_READWRITE);
        if (p == nullptr) {
-            using Xbyak::Error;
-            XBYAK_THROW(Xbyak::ERR_CANT_ALLOC);
+            throw Xbyak::Error(Xbyak::ERR_CANT_ALLOC);
        }
        return static_cast<uint8_t*>(p);
    }
@ -99,8 +95,7 @@ public:

        void* p = mmap(nullptr, size, PROT_READ | PROT_WRITE, mode, -1, 0);
        if (p == MAP_FAILED) {
-            using Xbyak::Error;
-            XBYAK_THROW(Xbyak::ERR_CANT_ALLOC);
+            throw Xbyak::Error(Xbyak::ERR_CANT_ALLOC);
        }
        std::memcpy(p, &size, sizeof(size_t));
        return static_cast<uint8_t*>(p) + DYNARMIC_PAGE_SIZE;
@ -519,8 +514,7 @@ size_t BlockOfCode::GetTotalCodeSize() const {

 void* BlockOfCode::AllocateFromCodeSpace(size_t alloc_size) {
    if (size_ + alloc_size >= maxSize_) {
-        using Xbyak::Error;
-        XBYAK_THROW(Xbyak::ERR_CODE_IS_TOO_BIG);
+        throw Xbyak::Error(Xbyak::ERR_CODE_IS_TOO_BIG);
    }

    EnsureMemoryCommitted(alloc_size);
--- a/externals/dynarmic/src/dynarmic/backend/x64/block_of_code.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/block_of_code.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -14,7 +11,7 @@
 #include <type_traits>

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

--- a/externals/dynarmic/src/dynarmic/backend/x64/callback.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/callback.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <functional>
 #include <vector>

-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <xbyak/xbyak.h>

 namespace Dynarmic::Backend::X64 {
--- a/externals/dynarmic/src/dynarmic/backend/x64/constant_pool.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/constant_pool.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <cstring>

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

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

--- a/externals/dynarmic/src/dynarmic/backend/x64/constant_pool.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/constant_pool.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -13,7 +10,7 @@
 #include <span>
 #include <utility>

-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <ankerl/unordered_dense.h>
 #include <xbyak/xbyak.h>

--- a/externals/dynarmic/src/dynarmic/backend/x64/constants.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/constants.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <optional>

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

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

--- a/externals/dynarmic/src/dynarmic/backend/x64/devirtualize.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/devirtualize.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,7 +9,7 @@
 #include <utility>

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

 #include "dynarmic/backend/x64/callback.h"
--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,10 +7,10 @@

 #include <iterator>

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

 #include "dynarmic/backend/x64/block_of_code.h"
@ -107,7 +104,7 @@ void EmitX64::PushRSBHelper(Xbyak::Reg64 loc_desc_reg, Xbyak::Reg64 index_reg, I
 }

 void EmitX64::EmitVerboseDebuggingOutput(RegAlloc& reg_alloc) {
-    code.lea(rsp, ptr[rsp - sizeof(RegisterData)]);
+    code.sub(rsp, sizeof(RegisterData));
    code.stmxcsr(dword[rsp + offsetof(RegisterData, mxcsr)]);
    for (int i = 0; i < 16; i++) {
        if (rsp.getIdx() == i) {
@ -226,7 +223,7 @@ void EmitX64::EmitGetNZCVFromOp(EmitContext& ctx, IR::Inst* inst) {
    const Xbyak::Reg value = ctx.reg_alloc.UseGpr(args[0]).changeBit(bitsize);
    code.test(value, value);
    code.lahf();
-    code.xor_(al, al);
+    code.mov(al, 0);
    ctx.reg_alloc.DefineValue(inst, nzcv);
 }

@ -273,6 +270,7 @@ void EmitX64::EmitNZCVFromPackedFlags(EmitContext& ctx, IR::Inst* inst) {
        code.shr(nzcv, 28);
        code.imul(nzcv, nzcv, NZCV::to_x64_multiplier);
        code.and_(nzcv, NZCV::x64_mask);
+
        ctx.reg_alloc.DefineValue(inst, nzcv);
    }
 }
@ -333,8 +331,10 @@ Xbyak::Label EmitX64::EmitCond(IR::Cond cond) {
        code.jle(pass);
        break;
    default:
-        UNREACHABLE();
+        ASSERT_MSG(false, "Unknown cond {}", static_cast<size_t>(cond));
+        break;
    }
+
    return pass;
 }

--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_aes.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_aes.cpp
@ -1,12 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
 */

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

 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/block_of_code.h"
--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_data_processing.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_data_processing.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,8 +6,8 @@
 #include <cstddef>
 #include <type_traits>

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

 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/backend/x64/emit_x64.h"
@ -995,6 +992,7 @@ static void EmitAdd(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst, int bit
        code.seto(overflow);
        ctx.reg_alloc.DefineValue(overflow_inst, overflow);
    }
+
    ctx.reg_alloc.DefineValue(inst, result);
 }

--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,14 +7,14 @@
 #include <type_traits>
 #include <utility>

-#include "dynarmic/common/assert.h"
+#include <mcl/assert.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 "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <mcl/type_traits/integer_of_size.hpp>
 #include <xbyak/xbyak.h>

@ -36,23 +33,6 @@
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/microinstruction.h"

-#define FCODE(NAME)                  \
-    [&code](auto... args) {          \
-        if constexpr (fsize == 32) { \
-            code.NAME##s(args...);   \
-        } else {                     \
-            code.NAME##d(args...);   \
-        }                            \
-    }
-#define ICODE(NAME)                  \
-    [&code](auto... args) {          \
-        if constexpr (fsize == 32) { \
-            code.NAME##d(args...);   \
-        } else {                     \
-            code.NAME##q(args...);   \
-        }                            \
-    }
-
 namespace Dynarmic::Backend::X64 {

 using namespace Xbyak::util;
@ -80,6 +60,23 @@ constexpr u64 f64_max_s32 = 0x41dfffffffc00000u;      // 2147483647 as a double
 constexpr u64 f64_max_u32 = 0x41efffffffe00000u;      // 4294967295 as a double
 constexpr u64 f64_max_s64_lim = 0x43e0000000000000u;  // 2^63 as a double (actual maximum unrepresentable)

+#define FCODE(NAME)                  \
+    [&code](auto... args) {          \
+        if constexpr (fsize == 32) { \
+            code.NAME##s(args...);   \
+        } else {                     \
+            code.NAME##d(args...);   \
+        }                            \
+    }
+#define ICODE(NAME)                  \
+    [&code](auto... args) {          \
+        if constexpr (fsize == 32) { \
+            code.NAME##d(args...);   \
+        } else {                     \
+            code.NAME##q(args...);   \
+        }                            \
+    }
+
 template<size_t fsize>
 void ForceDenormalsToZero(BlockOfCode& code, std::initializer_list<Xbyak::Xmm> to_daz) {
    if (code.HasHostFeature(HostFeature::AVX512_OrthoFloat)) {
@ -476,7 +473,7 @@ static void EmitFPMinMax(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
 }

 template<size_t fsize, bool is_max>
-static inline void EmitFPMinMaxNumeric(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) noexcept {
+static void EmitFPMinMaxNumeric(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
    using FPT = mcl::unsigned_integer_of_size<fsize>;
    constexpr FPT default_nan = FP::FPInfo<FPT>::DefaultNaN();

@ -704,14 +701,15 @@ static void EmitFPMulAdd(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
                    // x64 rounds before flushing to zero
                    // AArch64 rounds after flushing to zero
                    // This difference of behaviour is noticable if something would round to a smallest normalized number
-                    code.lea(rsp, ptr[rsp - 8]);
+
+                    code.sub(rsp, 8);
                    ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                    code.movq(code.ABI_PARAM1, operand1);
                    code.movq(code.ABI_PARAM2, operand2);
                    code.movq(code.ABI_PARAM3, operand3);
                    code.mov(code.ABI_PARAM4.cvt32(), ctx.FPCR().Value());
 #ifdef _WIN32
-                    code.lea(rsp, ptr[rsp - (16 + ABI_SHADOW_SPACE)]);
+                    code.sub(rsp, 16 + ABI_SHADOW_SPACE);
                    code.lea(rax, code.ptr[code.r15 + code.GetJitStateInfo().offsetof_fpsr_exc]);
                    code.mov(qword[rsp + ABI_SHADOW_SPACE], rax);
                    code.CallFunction(fallback_fn);
@ -737,13 +735,13 @@ static void EmitFPMulAdd(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
                    code.vmovaps(xmm0, code.Const(xword, FP::FPInfo<FPT>::mantissa_msb));

                    FCODE(ucomis)(operand2, operand3);
-                    code.jp(has_nan, code.T_NEAR);
+                    code.jp(has_nan);
                    FCODE(ucomis)(operand1, operand1);
-                    code.jnp(indeterminate, code.T_NEAR);
+                    code.jnp(indeterminate);

                    // AArch64 specifically emits a default NaN for the case when the addend is a QNaN and the two other arguments are {inf, zero}
                    code.ptest(operand1, xmm0);
-                    code.jz(op1_snan, code.T_NEAR);
+                    code.jz(op1_snan);
                    FCODE(vmuls)(xmm0, operand2, operand3);  // check if {op2, op3} are {inf, zero}/{zero, inf}
                    FCODE(ucomis)(xmm0, xmm0);
                    code.jnp(*end);
@ -755,10 +753,10 @@ static void EmitFPMulAdd(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
                    code.L(has_nan);

                    FCODE(ucomis)(operand1, operand1);
-                    code.jnp(op1_done, code.T_NEAR);
+                    code.jnp(op1_done);
                    code.movaps(result, operand1);  // this is done because of NaN behavior of vfmadd231s (priority of op2, op3, op1)
                    code.ptest(operand1, xmm0);
-                    code.jnz(op1_done, code.T_NEAR);
+                    code.jnz(op1_done);
                    code.L(op1_snan);
                    code.vorps(result, operand1, xmm0);
                    code.jmp(*end);
@ -776,9 +774,9 @@ static void EmitFPMulAdd(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
                    code.L(op2_done);

                    FCODE(ucomis)(operand3, operand3);
-                    code.jnp(op3_done, code.T_NEAR);
+                    code.jnp(op3_done);
                    code.ptest(operand3, xmm0);
-                    code.jnz(op3_done, code.T_NEAR);
+                    code.jnz(op3_done);
                    code.vorps(result, operand3, xmm0);
                    code.jmp(*end);
                    code.L(op3_done);
@ -1021,7 +1019,7 @@ static void EmitFPRecipStepFused(BlockOfCode& code, EmitContext& ctx, IR::Inst*
            ctx.deferred_emits.emplace_back([=, &code, &ctx] {
                code.L(*fallback);

-                code.lea(rsp, ptr[rsp - 8]);
+                code.sub(rsp, 8);
                ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                code.movq(code.ABI_PARAM1, operand1);
                code.movq(code.ABI_PARAM2, operand2);
@ -1206,9 +1204,9 @@ static void EmitFPRSqrtEstimate(BlockOfCode& code, EmitContext& ctx, IR::Inst* i
                    }

                    // a > 0 && a < 0x00800000;
-                    code.dec(tmp);
+                    code.sub(tmp, 1);
                    code.cmp(tmp, 0x007FFFFF);
-                    code.jb(fallback, code.T_NEAR); //within -127,128
+                    code.jb(fallback);
                    needs_fallback = true;
                }

@ -1237,17 +1235,17 @@ static void EmitFPRSqrtEstimate(BlockOfCode& code, EmitContext& ctx, IR::Inst* i

                code.ucomisd(value, result);
                if (ctx.FPCR().DN()) {
-                    code.jc(default_nan, code.T_NEAR);
-                    code.je(zero, code.T_NEAR);
+                    code.jc(default_nan);
+                    code.je(zero);
                } else {
-                    code.jp(nan, code.T_NEAR);
-                    code.je(zero, code.T_NEAR);
-                    code.jc(default_nan, code.T_NEAR);
+                    code.jp(nan);
+                    code.je(zero);
+                    code.jc(default_nan);
                }

                if (!ctx.FPCR().FZ()) {
                    needs_fallback = true;
-                    code.jmp(fallback, code.T_NEAR);
+                    code.jmp(fallback);
                } else {
                    // result = 0
                    code.jmp(*end, code.T_NEAR);
@ -1280,7 +1278,7 @@ static void EmitFPRSqrtEstimate(BlockOfCode& code, EmitContext& ctx, IR::Inst* i

            code.L(fallback);
            if (needs_fallback) {
-                code.lea(rsp, ptr[rsp - 8]);
+                code.sub(rsp, 8);
                ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                code.movq(code.ABI_PARAM1, operand);
                code.mov(code.ABI_PARAM2.cvt32(), ctx.FPCR().Value());
@ -1363,7 +1361,7 @@ static void EmitFPRSqrtStepFused(BlockOfCode& code, EmitContext& ctx, IR::Inst*
            ctx.deferred_emits.emplace_back([=, &code, &ctx] {
                code.L(*fallback);

-                code.lea(rsp, ptr[rsp - 8]);
+                code.sub(rsp, 8);
                ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                code.movq(code.ABI_PARAM1, operand1);
                code.movq(code.ABI_PARAM2, operand2);
@ -2134,6 +2132,3 @@ void EmitX64::EmitFPFixedU64ToSingle(EmitContext& ctx, IR::Inst* inst) {
    ctx.reg_alloc.DefineValue(inst, result);
 }
 }  // namespace Dynarmic::Backend::X64
-
-#undef FCODE
-#undef ICODE
--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h
@ -161,7 +161,8 @@ template<>

 template<>
 [[maybe_unused]] Xbyak::RegExp EmitFastmemVAddr<A64EmitContext>(BlockOfCode& code, A64EmitContext& ctx, Xbyak::Label& abort, Xbyak::Reg64 vaddr, bool& require_abort_handling, std::optional<Xbyak::Reg64> tmp) {
-    auto const unused_top_bits = 64 - ctx.conf.fastmem_address_space_bits;
+    const size_t unused_top_bits = 64 - ctx.conf.fastmem_address_space_bits;
+
    if (unused_top_bits == 0) {
        return r13 + vaddr;
    } else if (ctx.conf.silently_mirror_fastmem) {
@ -305,7 +306,7 @@ const void* EmitWriteMemoryMov(BlockOfCode& code, const Xbyak::RegExp& addr, int
            code.L(loop);
            code.lock();
            code.cmpxchg16b(xword[addr]);
-            code.jnz(loop, code.T_NEAR);
+            code.jnz(loop);
            break;
        }
        default:
@ -372,7 +373,7 @@ void EmitExclusiveTestAndClear(BlockOfCode& code, const UserConfig& conf, Xbyak:
        Xbyak::Label ok;
        code.mov(pointer, mcl::bit_cast<u64>(GetExclusiveMonitorAddressPointer(conf.global_monitor, processor_index)));
        code.cmp(qword[pointer], vaddr);
-        code.jne(ok, code.T_NEAR);
+        code.jne(ok);
        code.mov(qword[pointer], tmp);
        code.L(ok);
    }
--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_saturation.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_saturation.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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,9 +5,9 @@

 #include <limits>

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

 #include "dynarmic/backend/x64/block_of_code.h"
--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,11 +9,11 @@
 #include <cstdlib>
 #include <type_traits>

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

--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,7 +9,7 @@
 #include <type_traits>
 #include <utility>

-#include "dynarmic/common/assert.h"
+#include <mcl/assert.hpp>
 #include <mcl/mp/metavalue/lift_value.hpp>
 #include <mcl/mp/typelist/cartesian_product.hpp>
 #include <mcl/mp/typelist/get.hpp>
@ -36,6 +33,13 @@
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/microinstruction.h"

+namespace Dynarmic::Backend::X64 {
+
+using namespace Xbyak::util;
+namespace mp = mcl::mp;
+
+namespace {
+
 #define FCODE(NAME)                  \
    [&code](auto... args) {          \
        if constexpr (fsize == 32) { \
@ -53,13 +57,6 @@
        }                            \
    }

-namespace Dynarmic::Backend::X64 {
-
-using namespace Xbyak::util;
-namespace mp = mcl::mp;
-
-namespace {
-
 template<typename Lambda>
 void MaybeStandardFPSCRValue(BlockOfCode& code, EmitContext& ctx, bool fpcr_controlled, Lambda lambda) {
    const bool switch_mxcsr = ctx.FPCR(fpcr_controlled) != ctx.FPCR();
@ -125,11 +122,11 @@ void HandleNaNs(BlockOfCode& code, EmitContext& ctx, bool fpcr_controlled, std::

        const Xbyak::Xmm result = xmms[0];

-        code.lea(rsp, ptr[rsp - 8]);
+        code.sub(rsp, 8);
        ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));

        const size_t stack_space = xmms.size() * 16;
-        code.lea(rsp, ptr[rsp - static_cast<u32>(stack_space + ABI_SHADOW_SPACE)]);
+        code.sub(rsp, static_cast<u32>(stack_space + ABI_SHADOW_SPACE));
        for (size_t i = 0; i < xmms.size(); ++i) {
            code.movaps(xword[rsp + ABI_SHADOW_SPACE + i * 16], xmms[i]);
        }
@ -446,7 +443,7 @@ void EmitTwoOpFallbackWithoutRegAlloc(BlockOfCode& code, EmitContext& ctx, Xbyak
    const u32 fpcr = ctx.FPCR(fpcr_controlled).Value();

    constexpr u32 stack_space = 2 * 16;
-    code.lea(rsp, ptr[rsp - (stack_space + ABI_SHADOW_SPACE)]);
+    code.sub(rsp, stack_space + ABI_SHADOW_SPACE);
    code.lea(code.ABI_PARAM1, ptr[rsp + ABI_SHADOW_SPACE + 0 * 16]);
    code.lea(code.ABI_PARAM2, ptr[rsp + ABI_SHADOW_SPACE + 1 * 16]);
    code.mov(code.ABI_PARAM3.cvt32(), fpcr);
@ -482,7 +479,7 @@ void EmitThreeOpFallbackWithoutRegAlloc(BlockOfCode& code, EmitContext& ctx, Xby

 #ifdef _WIN32
    constexpr u32 stack_space = 4 * 16;
-    code.lea(rsp, ptr[rsp - (stack_space + ABI_SHADOW_SPACE)]);
+    code.sub(rsp, stack_space + ABI_SHADOW_SPACE);
    code.lea(code.ABI_PARAM1, ptr[rsp + ABI_SHADOW_SPACE + 1 * 16]);
    code.lea(code.ABI_PARAM2, ptr[rsp + ABI_SHADOW_SPACE + 2 * 16]);
    code.lea(code.ABI_PARAM3, ptr[rsp + ABI_SHADOW_SPACE + 3 * 16]);
@ -491,7 +488,7 @@ void EmitThreeOpFallbackWithoutRegAlloc(BlockOfCode& code, EmitContext& ctx, Xby
    code.mov(qword[rsp + ABI_SHADOW_SPACE + 0], rax);
 #else
    constexpr u32 stack_space = 3 * 16;
-    code.lea(rsp, ptr[rsp - (stack_space + ABI_SHADOW_SPACE)]);
+    code.sub(rsp, stack_space + ABI_SHADOW_SPACE);
    code.lea(code.ABI_PARAM1, ptr[rsp + ABI_SHADOW_SPACE + 0 * 16]);
    code.lea(code.ABI_PARAM2, ptr[rsp + ABI_SHADOW_SPACE + 1 * 16]);
    code.lea(code.ABI_PARAM3, ptr[rsp + ABI_SHADOW_SPACE + 2 * 16]);
@ -539,7 +536,7 @@ void EmitFourOpFallbackWithoutRegAlloc(BlockOfCode& code, EmitContext& ctx, Xbya

 #ifdef _WIN32
    constexpr u32 stack_space = 5 * 16;
-    code.lea(rsp, ptr[rsp - (stack_space + ABI_SHADOW_SPACE)]);
+    code.sub(rsp, stack_space + ABI_SHADOW_SPACE);
    code.lea(code.ABI_PARAM1, ptr[rsp + ABI_SHADOW_SPACE + 1 * 16]);
    code.lea(code.ABI_PARAM2, ptr[rsp + ABI_SHADOW_SPACE + 2 * 16]);
    code.lea(code.ABI_PARAM3, ptr[rsp + ABI_SHADOW_SPACE + 3 * 16]);
@ -549,7 +546,7 @@ void EmitFourOpFallbackWithoutRegAlloc(BlockOfCode& code, EmitContext& ctx, Xbya
    code.mov(qword[rsp + ABI_SHADOW_SPACE + 8], rax);
 #else
    constexpr u32 stack_space = 4 * 16;
-    code.lea(rsp, ptr[rsp - (stack_space + ABI_SHADOW_SPACE)]);
+    code.sub(rsp, stack_space + ABI_SHADOW_SPACE);
    code.lea(code.ABI_PARAM1, ptr[rsp + ABI_SHADOW_SPACE + 0 * 16]);
    code.lea(code.ABI_PARAM2, ptr[rsp + ABI_SHADOW_SPACE + 1 * 16]);
    code.lea(code.ABI_PARAM3, ptr[rsp + ABI_SHADOW_SPACE + 2 * 16]);
@ -1374,7 +1371,7 @@ void EmitFPVectorMulAdd(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {

            ctx.deferred_emits.emplace_back([=, &code, &ctx] {
                code.L(*fallback);
-                code.lea(rsp, ptr[rsp - 8]);
+                code.sub(rsp, 8);
                ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                if (needs_rounding_correction && needs_nan_correction) {
                    EmitFourOpFallbackWithoutRegAlloc<LoadPreviousResult::Yes>(code, ctx, result, xmm_a, xmm_b, xmm_c, EmitFPVectorMulAddFallback<FPT, true, true>, fpcr_controlled);
@ -1638,7 +1635,7 @@ static void EmitRecipStepFused(BlockOfCode& code, EmitContext& ctx, IR::Inst* in

            ctx.deferred_emits.emplace_back([=, &code, &ctx] {
                code.L(*fallback);
-                code.lea(rsp, ptr[rsp - 8]);
+                code.sub(rsp, 8);
                ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                EmitThreeOpFallbackWithoutRegAlloc(code, ctx, result, operand1, operand2, fallback_fn, fpcr_controlled);
                ABI_PopCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
@ -1815,7 +1812,7 @@ static void EmitRSqrtEstimate(BlockOfCode& code, EmitContext& ctx, IR::Inst* ins

            ctx.deferred_emits.emplace_back([=, &code, &ctx] {
                code.L(*bad_values);
-                code.lea(rsp, ptr[rsp - 8]);
+                code.sub(rsp, 8);
                ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                EmitTwoOpFallbackWithoutRegAlloc(code, ctx, result, operand, fallback_fn, fpcr_controlled);
                ABI_PopCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
@ -1901,7 +1898,7 @@ static void EmitRSqrtStepFused(BlockOfCode& code, EmitContext& ctx, IR::Inst* in

            ctx.deferred_emits.emplace_back([=, &code, &ctx] {
                code.L(*fallback);
-                code.lea(rsp, ptr[rsp - 8]);
+                code.sub(rsp, 8);
                ABI_PushCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
                EmitThreeOpFallbackWithoutRegAlloc(code, ctx, result, operand1, operand2, fallback_fn, fpcr_controlled);
                ABI_PopCallerSaveRegistersAndAdjustStackExcept(code, HostLocXmmIdx(result.getIdx()));
@ -2183,6 +2180,3 @@ void EmitX64::EmitFPVectorToUnsignedFixed64(EmitContext& ctx, IR::Inst* inst) {
 }

 }  // namespace Dynarmic::Backend::X64
-
-#undef FCODE
-#undef ICODE
--- a/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_saturation.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_saturation.cpp
@ -1,12 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 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 "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>

 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/backend/x64/constants.h"
@ -341,6 +338,3 @@ void EmitX64::EmitVectorUnsignedSaturatedSub64(EmitContext& ctx, IR::Inst* inst)
 }

 }  // namespace Dynarmic::Backend::X64
-
-#undef FCODE
-#undef ICODE
--- a/externals/dynarmic/src/dynarmic/backend/x64/exception_handler_windows.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/exception_handler_windows.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,9 +9,9 @@
 #include <cstring>
 #include <vector>

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

 #include "dynarmic/backend/exception_handler.h"
 #include "dynarmic/backend/x64/block_of_code.h"
@ -189,7 +186,7 @@ struct ExceptionHandler::Impl final {
        code.cmp(code.rax, static_cast<u32>(code.GetTotalCodeSize()));
        code.ja(exception_handler_without_cb);

-        code.lea(code.rsp, code.ptr[code.rsp - 8]);
+        code.sub(code.rsp, 8);
        code.mov(code.ABI_PARAM1, mcl::bit_cast<u64>(&cb));
        code.mov(code.ABI_PARAM2, code.ABI_PARAM3);
        code.CallLambda(
--- a/externals/dynarmic/src/dynarmic/backend/x64/exclusive_monitor.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/exclusive_monitor.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <algorithm>

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

 namespace Dynarmic {

--- a/externals/dynarmic/src/dynarmic/backend/x64/host_feature.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/host_feature.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2021 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -8,7 +5,7 @@

 #pragma once

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

 namespace Dynarmic::Backend::X64 {

--- a/externals/dynarmic/src/dynarmic/backend/x64/hostloc.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/hostloc.h
@ -1,14 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
 */
 #pragma once

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

 namespace Dynarmic::Backend::X64 {
--- a/externals/dynarmic/src/dynarmic/backend/x64/nzcv_util.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/nzcv_util.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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 @@

 #pragma once

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

 namespace Dynarmic::Backend::X64::NZCV {

--- a/externals/dynarmic/src/dynarmic/backend/x64/oparg.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/oparg.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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 @@

 #pragma once

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

 namespace Dynarmic::Backend::X64 {
--- a/externals/dynarmic/src/dynarmic/backend/x64/reg_alloc.cpp
+++ b/externals/dynarmic/src/dynarmic/backend/x64/reg_alloc.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -13,7 +10,7 @@
 #include <utility>

 #include <fmt/ostream.h>
-#include "dynarmic/common/assert.h"
+#include <mcl/assert.hpp>
 #include <mcl/bit_cast.hpp>
 #include <xbyak/xbyak.h>

@ -418,54 +415,21 @@ void RegAlloc::ReleaseStackSpace(const size_t stack_space) noexcept {
 }

 HostLoc RegAlloc::SelectARegister(const boost::container::static_vector<HostLoc, 28>& desired_locations) const noexcept {
-    // TODO(lizzie): Overspill causes issues (reads to 0 and such) on some games, I need to make a testbench
-    // to later track this down - however I just modified the LRU algo so it prefers empty registers first
-    // we need to test high register pressure (and spills, maybe 32 regs?)
+    boost::container::static_vector<HostLoc, 28> candidates = desired_locations; //Who let someone copy an ENTIRE VECTOR here?
+
+    // Find all locations that have not been allocated..
+    const auto allocated_locs = std::partition(candidates.begin(), candidates.end(), [this](auto loc) noexcept {
+        return !this->LocInfo(loc).IsLocked();
+    });
+    candidates.erase(allocated_locs, candidates.end());
+    ASSERT_MSG(!candidates.empty(), "All candidate registers have already been allocated");

    // Selects the best location out of the available locations.
-    // NOTE: Using last is BAD because new REX prefix for each insn using the last regs
    // TODO: Actually do LRU or something. Currently we just try to pick something without a value if possible.
-    auto min_lru_counter = size_t(-1);
-    auto it_candidate = desired_locations.cend(); //default fallback if everything fails
-    auto it_rex_candidate = desired_locations.cend();
-    auto it_empty_candidate = desired_locations.cend();
-    for (auto it = desired_locations.cbegin(); it != desired_locations.cend(); it++) {
-        auto const& loc_info = LocInfo(*it);
-        // Abstain from using upper registers unless absolutely nescesary
-        if (loc_info.IsLocked()) {
-            // skip, not suitable for allocation
-        } else {
-            if (loc_info.lru_counter < min_lru_counter) {
-                if (loc_info.IsEmpty())
-                    it_empty_candidate = it;
-                // Otherwise a "quasi"-LRU
-                min_lru_counter = loc_info.lru_counter;
-                if (*it >= HostLoc::R8 && *it <= HostLoc::R15) {
-                    it_rex_candidate = it;
-                } else {
-                    it_candidate = it;
-                }
-                if (min_lru_counter == 0)
-                    break; //early exit
-            }
-            // only if not assigned (i.e for failcase of all LRU=0)
-            if (it_empty_candidate == desired_locations.cend() && loc_info.IsEmpty())
-                it_empty_candidate = it;
-        }
-    }
-    // Final resolution goes as follows:
-    // 1 => Try an empty candidate
-    // 2 => Try normal candidate (no REX prefix)
-    // 3 => Try using a REX prefixed one
-    // We avoid using REX-addressable registers because they add +1 REX prefix which
-    // do we really need? The trade-off may not be worth it.
-    auto const it_final = it_empty_candidate != desired_locations.cend()
-        ? it_empty_candidate : it_candidate != desired_locations.cend()
-        ? it_candidate : it_rex_candidate;
-    ASSERT_MSG(it_final != desired_locations.cend(), "All candidate registers have already been allocated");
-    // Evil magic - increment LRU counter (will wrap at 256)
-    const_cast<RegAlloc*>(this)->LocInfo(*it_final).lru_counter++;
-    return *it_final;
+    auto const it = std::find_if(candidates.begin(), candidates.end(), [this](auto const loc) noexcept {
+        return this->LocInfo(loc).IsEmpty();
+    });
+    return it != candidates.end() ? *it : candidates.front();
 }

 void RegAlloc::DefineValueImpl(IR::Inst* def_inst, HostLoc host_loc) noexcept {
--- a/externals/dynarmic/src/dynarmic/backend/x64/reg_alloc.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/reg_alloc.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -12,7 +9,7 @@
 #include <functional>
 #include <optional>

-#include "dynarmic/common/common_types.h"
+#include <mcl/stdint.hpp>
 #include <xbyak/xbyak.h>
 #include <boost/container/static_vector.hpp>
 #include <boost/container/flat_set.hpp>
@ -95,8 +92,8 @@ private:
    uint8_t max_bit_width = 0; //Valid values: 1,2,4,8,16,32,128
    bool is_scratch : 1 = false; //1
    bool is_set_last_use : 1 = false; //1
-    alignas(16) uint8_t lru_counter = 0; //1
-    friend class RegAlloc;
+
+    alignas(16) char padding;
 };
 static_assert(sizeof(HostLocInfo) == 64);

--- a/externals/dynarmic/src/dynarmic/backend/x64/stack_layout.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/stack_layout.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Backend::X64 {

--- a/externals/dynarmic/src/dynarmic/backend/x64/verbose_debugging_output.h
+++ b/externals/dynarmic/src/dynarmic/backend/x64/verbose_debugging_output.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2023 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -10,7 +7,7 @@

 #include <array>

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

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

--- a/externals/dynarmic/src/dynarmic/common/atomic.h
+++ b/externals/dynarmic/src/dynarmic/common/atomic.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

 #pragma once

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

 namespace Dynarmic::Atomic {

--- a/externals/dynarmic/src/dynarmic/common/crypto/aes.cpp
+++ b/externals/dynarmic/src/dynarmic/common/crypto/aes.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Common::Crypto::AES {

--- a/externals/dynarmic/src/dynarmic/common/crypto/aes.h
+++ b/externals/dynarmic/src/dynarmic/common/crypto/aes.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Common::Crypto::AES {

--- a/externals/dynarmic/src/dynarmic/common/crypto/crc32.cpp
+++ b/externals/dynarmic/src/dynarmic/common/crypto/crc32.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Common::Crypto::CRC32 {

--- a/externals/dynarmic/src/dynarmic/common/crypto/crc32.h
+++ b/externals/dynarmic/src/dynarmic/common/crypto/crc32.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

 #pragma once

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

 namespace Dynarmic::Common::Crypto::CRC32 {

--- a/externals/dynarmic/src/dynarmic/common/crypto/sm4.cpp
+++ b/externals/dynarmic/src/dynarmic/common/crypto/sm4.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <array>

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

 namespace Dynarmic::Common::Crypto::SM4 {

--- a/externals/dynarmic/src/dynarmic/common/crypto/sm4.h
+++ b/externals/dynarmic/src/dynarmic/common/crypto/sm4.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

 #pragma once

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

 namespace Dynarmic::Common::Crypto::SM4 {

--- a/externals/dynarmic/src/dynarmic/common/fp/fpcr.h
+++ b/externals/dynarmic/src/dynarmic/common/fp/fpcr.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,9 +7,9 @@

 #include <optional>

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

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

--- a/externals/dynarmic/src/dynarmic/common/fp/fpsr.h
+++ b/externals/dynarmic/src/dynarmic/common/fp/fpsr.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,7 +6,7 @@
 #pragma once

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

 namespace Dynarmic::FP {

--- a/externals/dynarmic/src/dynarmic/common/fp/info.h
+++ b/externals/dynarmic/src/dynarmic/common/fp/info.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,7 +6,7 @@
 #pragma once

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

 namespace Dynarmic::FP {

--- a/externals/dynarmic/src/dynarmic/common/fp/mantissa_util.h
+++ b/externals/dynarmic/src/dynarmic/common/fp/mantissa_util.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

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

 namespace Dynarmic::FP {

--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPConvert.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPConvert.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 /* This file is part of the dynarmic project.
 * Copyright (c) 2019 MerryMage
 * SPDX-License-Identifier: 0BSD
@ -10,7 +7,7 @@

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPMulAdd.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPMulAdd.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

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

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPRSqrtEstimate.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPRSqrtEstimate.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

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

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPRecipEstimate.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPRecipEstimate.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,8 +7,8 @@

 #include <tuple>

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPRecipExponent.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPRecipExponent.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,7 +6,7 @@
 #include "dynarmic/common/fp/op/FPRecipExponent.h"

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPRoundInt.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPRoundInt.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,9 +5,9 @@

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

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPRoundInt.h
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPRoundInt.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

 #pragma once

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

 namespace Dynarmic::FP {

--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPToFixed.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPToFixed.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -9,10 +6,10 @@
 #include "dynarmic/common/fp/op/FPToFixed.h"

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/op/FPToFixed.h
+++ b/externals/dynarmic/src/dynarmic/common/fp/op/FPToFixed.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

 #pragma once

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

 namespace Dynarmic::FP {

--- a/externals/dynarmic/src/dynarmic/common/fp/process_exception.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/process_exception.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -8,7 +5,7 @@

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

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

 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/process_nan.cpp
+++ b/externals/dynarmic/src/dynarmic/common/fp/process_nan.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <optional>

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

 #include "dynarmic/common/fp/fpcr.h"
--- a/externals/dynarmic/src/dynarmic/common/fp/unpacked.h
+++ b/externals/dynarmic/src/dynarmic/common/fp/unpacked.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <tuple>

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

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

--- a/externals/dynarmic/src/dynarmic/common/llvm_disassemble.cpp
+++ b/externals/dynarmic/src/dynarmic/common/llvm_disassemble.cpp
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -15,9 +12,9 @@
 #    include <llvm-c/Target.h>
 #endif

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

 #include "dynarmic/common/llvm_disassemble.h"

--- a/externals/dynarmic/src/dynarmic/common/llvm_disassemble.h
+++ b/externals/dynarmic/src/dynarmic/common/llvm_disassemble.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <string>

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

 namespace Dynarmic::Common {

--- a/externals/dynarmic/src/dynarmic/common/math_util.h
+++ b/externals/dynarmic/src/dynarmic/common/math_util.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -10,7 +7,7 @@

 #include <utility>

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

 namespace Dynarmic::Common {

--- a/externals/dynarmic/src/dynarmic/common/safe_ops.h
+++ b/externals/dynarmic/src/dynarmic/common/safe_ops.h
@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
@ -11,7 +8,7 @@
 #include <type_traits>

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

 #include "dynarmic/common/u128.h"

--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`Subproject commit 2e4c12cd2cb2c5d0b60ef2196b400339591e733c`