drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-19 10:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dynarmic): resolve fastmem_pointer type compatibility issues

Browse Source 
- Convert fastmem_pointer assignments from raw pointers to uintptr_t
- Replace nullptr comparisons with std::optional::has_value()
- Use std::nullopt instead of nullptr for optional types
- Update Dynarmic submodule to commit 9d4582339

Signed-off-by: Zephyron <zephyron@citron-emu.org>
This commit is contained in:
Zephyron
2025-09-27 20:22:04 +10:00
parent 9e6956a93f
commit 23352d4a3f
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals/dynarmic vendored

Submodule externals/dynarmic updated: ba8192d890...9d45823399

7
src/core/arm/dynarmic/arm_dynarmic_32.cpp
View File

@@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "common/settings.h" #include "common/settings.h"
@@ -192,9 +193,9 @@ std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* pa
config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128; config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128;
config.only_detect_misalignment_via_page_table_on_page_boundary = true; config.only_detect_misalignment_via_page_table_on_page_boundary = true;
config.fastmem_pointer = page_table->fastmem_arena; config.fastmem_pointer = reinterpret_cast<uintptr_t>(page_table->fastmem_arena);
config.fastmem_exclusive_access = config.fastmem_pointer != nullptr; config.fastmem_exclusive_access = config.fastmem_pointer.has_value();
config.recompile_on_exclusive_fastmem_failure = true; config.recompile_on_exclusive_fastmem_failure = true;
} }
@@ -251,7 +252,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* pa
config.only_detect_misalignment_via_page_table_on_page_boundary = false; config.only_detect_misalignment_via_page_table_on_page_boundary = false;
} }
if (!Settings::values.cpuopt_fastmem) { if (!Settings::values.cpuopt_fastmem) {
config.fastmem_pointer = nullptr; config.fastmem_pointer = std::nullopt;
config.fastmem_exclusive_access = false; config.fastmem_exclusive_access = false;
} }
if (!Settings::values.cpuopt_fastmem_exclusives) { if (!Settings::values.cpuopt_fastmem_exclusives) {

7
src/core/arm/dynarmic/arm_dynarmic_64.cpp
View File

@@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "common/settings.h" #include "common/settings.h"
@@ -239,11 +240,11 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* pa
config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128; config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128;
config.only_detect_misalignment_via_page_table_on_page_boundary = true; config.only_detect_misalignment_via_page_table_on_page_boundary = true;
config.fastmem_pointer = page_table->fastmem_arena; config.fastmem_pointer = reinterpret_cast<uintptr_t>(page_table->fastmem_arena);
config.fastmem_address_space_bits = address_space_bits; config.fastmem_address_space_bits = address_space_bits;
config.silently_mirror_fastmem = false; config.silently_mirror_fastmem = false;
config.fastmem_exclusive_access = config.fastmem_pointer != nullptr; config.fastmem_exclusive_access = config.fastmem_pointer.has_value();
config.recompile_on_exclusive_fastmem_failure = true; config.recompile_on_exclusive_fastmem_failure = true;
} }
@@ -310,7 +311,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* pa
config.only_detect_misalignment_via_page_table_on_page_boundary = false; config.only_detect_misalignment_via_page_table_on_page_boundary = false;
} }
if (!Settings::values.cpuopt_fastmem) { if (!Settings::values.cpuopt_fastmem) {
config.fastmem_pointer = nullptr; config.fastmem_pointer = std::nullopt;
config.fastmem_exclusive_access = false; config.fastmem_exclusive_access = false;
} }
if (!Settings::values.cpuopt_fastmem_exclusives) { if (!Settings::values.cpuopt_fastmem_exclusives) {