VERY experimental Nintendo Switch 2 emulator
C++
[dynarmic] make Xbyak::CodeGen use Ankerl for backing unordered maps (#3438)
lizzied5aa10d57247
diff --git a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cpp b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cppindex db7fef5334..a6b99b545f 100644--- a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -14,7 +14,7 @@#include <fmt/format.h>#include <fmt/ostream.h>#include <mcl/type_traits/integer_of_size.hpp>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/a32_emit_x64.h"#include "dynarmic/backend/x64/abi.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cppindex 8ae5b30172..6b3d4d86a5 100644--- a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -14,7 +14,7 @@#include <fmt/format.h>#include <fmt/ostream.h>#include <mcl/type_traits/integer_of_size.hpp>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/a64_emit_x64.h"#include "dynarmic/backend/x64/abi.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/abi.cpp b/src/dynarmic/src/dynarmic/backend/x64/abi.cppindex 299bf1d1d6..14f1b287ac 100644--- a/src/dynarmic/src/dynarmic/backend/x64/abi.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/abi.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -11,7 +11,7 @@#include <algorithm>#include "dynarmic/common/common_types.h"-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/block_of_code.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cppindex 3715dfa7ec..28c821ab59 100644--- a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -26,7 +26,7 @@#include "dynarmic/common/assert.h"#include <mcl/bit/bit_field.hpp>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/a32_jitstate.h"#include "dynarmic/backend/x64/abi.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.h b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.hindex 095e75336b..5ccab7a3ed 100644--- a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.h+++ b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -15,9 +15,7 @@#include <mcl/bit/bit_field.hpp>#include "dynarmic/common/common_types.h"-#include <xbyak/xbyak.h>-#include <xbyak/xbyak_util.h>-+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/abi.h"#include "dynarmic/backend/x64/callback.h"#include "dynarmic/backend/x64/constant_pool.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/callback.h b/src/dynarmic/src/dynarmic/backend/x64/callback.hindex 3254eea66c..2bd917ad76 100644--- a/src/dynarmic/src/dynarmic/backend/x64/callback.h+++ b/src/dynarmic/src/dynarmic/backend/x64/callback.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -12,7 +12,7 @@#include <vector>#include "dynarmic/common/common_types.h"-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"namespace Dynarmic::Backend::X64 {diff --git a/src/dynarmic/src/dynarmic/backend/x64/constant_pool.h b/src/dynarmic/src/dynarmic/backend/x64/constant_pool.hindex 8115dcff26..efb19f48ed 100644--- a/src/dynarmic/src/dynarmic/backend/x64/constant_pool.h+++ b/src/dynarmic/src/dynarmic/backend/x64/constant_pool.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -15,7 +15,7 @@#include "dynarmic/common/common_types.h"#include <ankerl/unordered_dense.h>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"namespace Dynarmic::Backend::X64 {diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.hindex c63004ee6f..5de5f2dc7a 100644--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h@@ -18,8 +18,7 @@#include <mcl/bitsizeof.hpp>#include <ankerl/unordered_dense.h>-#include <xbyak/xbyak.h>-#include <xbyak/xbyak_util.h>+#include "dynarmic/backend/x64/xbyak.h"#include <boost/container/small_vector.hpp>#include "dynarmic/backend/exception_handler.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cppindex 6e618130c4..76c103ec6f 100644--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -19,7 +19,7 @@#include <mcl/mp/typelist/lower_to_tuple.hpp>#include "dynarmic/common/common_types.h"#include <mcl/type_traits/integer_of_size.hpp>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/abi.h"#include "dynarmic/backend/x64/block_of_code.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.hindex 2836e0aad2..211f620ceb 100644--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h@@ -7,7 +7,7 @@*/#include <bit>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/a32_emit_x64.h"#include "dynarmic/backend/x64/a64_emit_x64.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cppindex 5c5b376a8b..1f96939d88 100644--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp@@ -18,7 +18,7 @@#include <mcl/bitsizeof.hpp>#include "dynarmic/common/common_types.h"#include <mcl/type_traits/function_info.hpp>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/abi.h"#include "dynarmic/backend/x64/block_of_code.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cppindex c2bd071b99..2247b18fcd 100644--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -21,7 +21,7 @@#include <mcl/mp/typelist/lower_to_tuple.hpp>#include <mcl/type_traits/function_info.hpp>#include <mcl/type_traits/integer_of_size.hpp>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/abi.h"#include "dynarmic/backend/x64/block_of_code.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/hostloc.h b/src/dynarmic/src/dynarmic/backend/x64/hostloc.hindex 1158e48253..bd6a5cede8 100644--- a/src/dynarmic/src/dynarmic/backend/x64/hostloc.h+++ b/src/dynarmic/src/dynarmic/backend/x64/hostloc.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -9,7 +9,7 @@#include "dynarmic/common/assert.h"#include "dynarmic/common/common_types.h"-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"namespace Dynarmic::Backend::X64 {diff --git a/src/dynarmic/src/dynarmic/backend/x64/oparg.h b/src/dynarmic/src/dynarmic/backend/x64/oparg.hindex 8aa2f35034..d16728d19f 100644--- a/src/dynarmic/src/dynarmic/backend/x64/oparg.h+++ b/src/dynarmic/src/dynarmic/backend/x64/oparg.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -9,7 +9,7 @@#pragma once#include "dynarmic/common/assert.h"-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"namespace Dynarmic::Backend::X64 {diff --git a/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.cpp b/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.cppindex 115cb22ee9..f4326204b2 100644--- a/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -16,7 +16,7 @@#include <fmt/ostream.h>#include "dynarmic/common/assert.h"#include <bit>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/abi.h"#include "dynarmic/backend/x64/stack_layout.h"diff --git a/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.h b/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.hindex a4467e32c7..c0a896f8c3 100644--- a/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.h+++ b/src/dynarmic/src/dynarmic/backend/x64/reg_alloc.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -14,7 +14,7 @@#include "boost/container/small_vector.hpp"#include "dynarmic/common/common_types.h"-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include <boost/container/static_vector.hpp>#include <boost/container/flat_set.hpp>#include <boost/pool/pool_alloc.hpp>diff --git a/src/dynarmic/src/dynarmic/backend/x64/xbyak.h b/src/dynarmic/src/dynarmic/backend/x64/xbyak.hnew file mode 100644index 0000000000..3efc51f54f--- /dev/null+++ b/src/dynarmic/src/dynarmic/backend/x64/xbyak.h@@ -0,0 +1,14 @@+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later++#pragma once++#define XBYAK_STD_UNORDERED_SET ankerl::unordered_dense::set+#define XBYAK_STD_UNORDERED_MAP ankerl::unordered_dense::map+#define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap++#include <boost/unordered_map.hpp>+#include <ankerl/unordered_dense.h>++#include <xbyak/xbyak.h>+#include <xbyak/xbyak_util.h>diff --git a/src/dynarmic/src/dynarmic/common/spin_lock_x64.cpp b/src/dynarmic/src/dynarmic/common/spin_lock_x64.cppindex aa2f25803d..7607bbaafc 100644--- a/src/dynarmic/src/dynarmic/common/spin_lock_x64.cpp+++ b/src/dynarmic/src/dynarmic/common/spin_lock_x64.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -8,7 +8,7 @@#include <mutex>#include <optional>-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"#include "dynarmic/backend/x64/abi.h"#include "dynarmic/backend/x64/hostloc.h"diff --git a/src/dynarmic/src/dynarmic/common/spin_lock_x64.h b/src/dynarmic/src/dynarmic/common/spin_lock_x64.hindex df6860e2f2..b17d4f67f8 100644--- a/src/dynarmic/src/dynarmic/common/spin_lock_x64.h+++ b/src/dynarmic/src/dynarmic/common/spin_lock_x64.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -8,7 +8,7 @@#pragma once-#include <xbyak/xbyak.h>+#include "dynarmic/backend/x64/xbyak.h"namespace Dynarmic {