[xbyak] fix odr violation on MSVC

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cpp

@@ -14,7 +14,7 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include "dynarmic/mcl/integer_of_size.hpp"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/a32_emit_x64.h"
 #include "dynarmic/backend/x64/abi.h"

src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp

@@ -14,7 +14,7 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include "dynarmic/mcl/integer_of_size.hpp"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/a64_emit_x64.h"
 #include "dynarmic/backend/x64/abi.h"

src/dynarmic/src/dynarmic/backend/x64/abi.cpp

@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include "common/common_types.h"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/block_of_code.h"
 

src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp

@@ -26,7 +26,7 @@
 
 #include "common/assert.h"
 #include "dynarmic/mcl/bit.hpp"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/a32_jitstate.h"
 #include "dynarmic/backend/x64/abi.h"

src/dynarmic/src/dynarmic/backend/x64/block_of_code.h

@@ -15,7 +15,7 @@
 
 #include "dynarmic/mcl/bit.hpp"
 #include "common/common_types.h"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/callback.h"
 #include "dynarmic/backend/x64/constant_pool.h"

src/dynarmic/src/dynarmic/backend/x64/callback.h

@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "common/common_types.h"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/src/dynarmic/backend/x64/constant_pool.h

@@ -15,7 +15,7 @@
 
 #include "common/common_types.h"
 #include <ankerl/unordered_dense.h>
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/src/dynarmic/backend/x64/emit_x64.h

@@ -20,7 +20,7 @@
 #include <boost/container/stable_vector.hpp>
 #include <boost/container/small_vector.hpp>
 
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 #include "dynarmic/mcl/bit.hpp"
 #include "dynarmic/backend/exception_handler.h"
 #include "dynarmic/backend/x64/reg_alloc.h"

src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp

@@ -13,7 +13,7 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "dynarmic/mcl/integer_of_size.hpp"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/block_of_code.h"

src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <bit>
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/a32_emit_x64.h"
 #include "dynarmic/backend/x64/a64_emit_x64.h"

src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp

@@ -16,7 +16,7 @@
 #include "dynarmic/mcl/bit.hpp"
 #include "common/common_types.h"
 #include "dynarmic/mcl/function_info.hpp"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/block_of_code.h"

src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp

@@ -15,7 +15,7 @@
 #include "common/assert.h"
 #include "dynarmic/mcl/function_info.hpp"
 #include "dynarmic/mcl/integer_of_size.hpp"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/block_of_code.h"

src/dynarmic/src/dynarmic/backend/x64/hostloc.h

@@ -10,7 +10,7 @@
 #include <bitset>
 #include "common/assert.h"
 #include "common/common_types.h"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/src/dynarmic/backend/x64/oparg.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "common/assert.h"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/src/dynarmic/backend/x64/reg_alloc.cpp

@@ -15,7 +15,7 @@
 #include "dynarmic/backend/x64/hostloc.h"
 #include "common/assert.h"
 #include <bit>
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/reg_alloc.h"

src/dynarmic/src/dynarmic/backend/x64/reg_alloc.h

@@ -14,7 +14,7 @@
 
 #include "boost/container/small_vector.hpp"
 #include "common/common_types.h"
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 #include <boost/container/static_vector.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/pool/pool_alloc.hpp>

src/dynarmic/src/dynarmic/backend/x64/xbyak.h

@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-// You must ensure this matches with src/common/x64/xbyak.h on root dir
-#include <ankerl/unordered_dense.h>
-#include <boost/unordered_map.hpp>
-#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 <xbyak/xbyak.h>
-#include <xbyak/xbyak_util.h>

src/dynarmic/src/dynarmic/common/spin_lock_x64.cpp

@@ -8,7 +8,7 @@
 
 #include <mutex>
 #include <optional>
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 #include "dynarmic/backend/x64/abi.h"
 #include "dynarmic/backend/x64/hostloc.h"

src/dynarmic/src/dynarmic/common/spin_lock_x64.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 namespace Dynarmic {
 

src/dynarmic/tests/x64_cpu_info.cpp

@@ -14,7 +14,7 @@
 #include <utility>
 
 #include <catch2/catch_test_macros.hpp>
-#include "dynarmic/backend/x64/xbyak.h"
+#include "common/x64/xbyak.h"
 
 TEST_CASE("Host CPU supports", "[a64]") {
     using Cpu = Xbyak::util::Cpu;