Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 05:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "[dynarmic] make Xbyak::CodeGen use Ankerl for backing unordered maps (#3438)"

Browse source 
This reverts commit d5aa10d572.
This commit is contained in:
crueter 2026-02-20 12:24:58 -05:00
parent d5aa10d572
commit 4c2dcb7ba6
19 changed files with 36 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64_memory.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -14,7 +14,7 @@
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <mcl/type_traits/integer_of_size.hpp> #include <mcl/type_traits/integer_of_size.hpp>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/a32_emit_x64.h" #include "dynarmic/backend/x64/a32_emit_x64.h"
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"

4
src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64_memory.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -14,7 +14,7 @@
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <mcl/type_traits/integer_of_size.hpp> #include <mcl/type_traits/integer_of_size.hpp>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/a64_emit_x64.h" #include "dynarmic/backend/x64/a64_emit_x64.h"
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"

4
src/dynarmic/src/dynarmic/backend/x64/abi.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -11,7 +11,7 @@
#include <algorithm> #include <algorithm>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/block_of_code.h" #include "dynarmic/backend/x64/block_of_code.h"

4
src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -26,7 +26,7 @@
#include "dynarmic/common/assert.h" #include "dynarmic/common/assert.h"
#include <mcl/bit/bit_field.hpp> #include <mcl/bit/bit_field.hpp>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/a32_jitstate.h" #include "dynarmic/backend/x64/a32_jitstate.h"
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"

6
src/dynarmic/src/dynarmic/backend/x64/block_of_code.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -15,7 +15,9 @@
#include <mcl/bit/bit_field.hpp> #include <mcl/bit/bit_field.hpp>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include <xbyak/xbyak_util.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/callback.h" #include "dynarmic/backend/x64/callback.h"
#include "dynarmic/backend/x64/constant_pool.h" #include "dynarmic/backend/x64/constant_pool.h"

4
src/dynarmic/src/dynarmic/backend/x64/callback.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -12,7 +12,7 @@
#include <vector> #include <vector>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
namespace Dynarmic::Backend::X64 { namespace Dynarmic::Backend::X64 {

4
src/dynarmic/src/dynarmic/backend/x64/constant_pool.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -15,7 +15,7 @@
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include <ankerl/unordered_dense.h> #include <ankerl/unordered_dense.h>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
namespace Dynarmic::Backend::X64 { namespace Dynarmic::Backend::X64 {

3
src/dynarmic/src/dynarmic/backend/x64/emit_x64.h
View file

@ -18,7 +18,8 @@
#include <mcl/bitsizeof.hpp> #include <mcl/bitsizeof.hpp>
#include <ankerl/unordered_dense.h> #include <ankerl/unordered_dense.h>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include <xbyak/xbyak_util.h>
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
#include "dynarmic/backend/exception_handler.h" #include "dynarmic/backend/exception_handler.h"

4
src/dynarmic/src/dynarmic/backend/x64/emit_x64_floating_point.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -19,7 +19,7 @@
#include <mcl/mp/typelist/lower_to_tuple.hpp> #include <mcl/mp/typelist/lower_to_tuple.hpp>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include <mcl/type_traits/integer_of_size.hpp> #include <mcl/type_traits/integer_of_size.hpp>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/block_of_code.h" #include "dynarmic/backend/x64/block_of_code.h"

2
src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h
View file

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

2
src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector.cpp
View file

@ -18,7 +18,7 @@
#include <mcl/bitsizeof.hpp> #include <mcl/bitsizeof.hpp>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include <mcl/type_traits/function_info.hpp> #include <mcl/type_traits/function_info.hpp>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/block_of_code.h" #include "dynarmic/backend/x64/block_of_code.h"

4
src/dynarmic/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -21,7 +21,7 @@
#include <mcl/mp/typelist/lower_to_tuple.hpp> #include <mcl/mp/typelist/lower_to_tuple.hpp>
#include <mcl/type_traits/function_info.hpp> #include <mcl/type_traits/function_info.hpp>
#include <mcl/type_traits/integer_of_size.hpp> #include <mcl/type_traits/integer_of_size.hpp>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/block_of_code.h" #include "dynarmic/backend/x64/block_of_code.h"

4
src/dynarmic/src/dynarmic/backend/x64/hostloc.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -9,7 +9,7 @@
#include "dynarmic/common/assert.h" #include "dynarmic/common/assert.h"
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
namespace Dynarmic::Backend::X64 { namespace Dynarmic::Backend::X64 {

4
src/dynarmic/src/dynarmic/backend/x64/oparg.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -9,7 +9,7 @@
#pragma once #pragma once
#include "dynarmic/common/assert.h" #include "dynarmic/common/assert.h"
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
namespace Dynarmic::Backend::X64 { namespace Dynarmic::Backend::X64 {

4
src/dynarmic/src/dynarmic/backend/x64/reg_alloc.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -16,7 +16,7 @@
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include "dynarmic/common/assert.h" #include "dynarmic/common/assert.h"
#include <bit> #include <bit>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/stack_layout.h" #include "dynarmic/backend/x64/stack_layout.h"

4
src/dynarmic/src/dynarmic/backend/x64/reg_alloc.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -14,7 +14,7 @@
#include "boost/container/small_vector.hpp" #include "boost/container/small_vector.hpp"
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include <boost/container/static_vector.hpp> #include <boost/container/static_vector.hpp>
#include <boost/container/flat_set.hpp> #include <boost/container/flat_set.hpp>
#include <boost/pool/pool_alloc.hpp> #include <boost/pool/pool_alloc.hpp>

14
src/dynarmic/src/dynarmic/backend/x64/xbyak.h
View file

@ -1,14 +0,0 @@
// 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>

4
src/dynarmic/src/dynarmic/common/spin_lock_x64.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -8,7 +8,7 @@
#include <mutex> #include <mutex>
#include <optional> #include <optional>
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
#include "dynarmic/backend/x64/abi.h" #include "dynarmic/backend/x64/abi.h"
#include "dynarmic/backend/x64/hostloc.h" #include "dynarmic/backend/x64/hostloc.h"

4
src/dynarmic/src/dynarmic/common/spin_lock_x64.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project. /* This file is part of the dynarmic project.
@ -8,7 +8,7 @@
#pragma once #pragma once
#include "dynarmic/backend/x64/xbyak.h" #include <xbyak/xbyak.h>
namespace Dynarmic { namespace Dynarmic {