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

fix: MSVC Compiler Error

Browse Source
This commit is contained in:
collecting
2025-10-07 02:35:03 +00:00
parent 8f38c83a2e
commit 20e594ca46
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,7 +193,11 @@ 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 = reinterpret_cast<uintptr_t>(page_table->fastmem_arena); #ifdef _MSC_VER
config.fastmem_pointer = page_table->fastmem_arena;
#else
config.fastmem_pointer = reinterpret_cast<uintptr_t>(page_table->fastmem_arena);
#endif
config.fastmem_exclusive_access = config.fastmem_pointer.has_value(); config.fastmem_exclusive_access = config.fastmem_pointer.has_value();
config.recompile_on_exclusive_fastmem_failure = true; config.recompile_on_exclusive_fastmem_failure = true;
@@ -252,7 +256,11 @@ 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 = std::nullopt; #ifdef _MSC_VER
config.fastmem_pointer = nullptr;
#else
config.fastmem_pointer = std::nullopt;
#endif
config.fastmem_exclusive_access = false; config.fastmem_exclusive_access = false;
} }
if (!Settings::values.cpuopt_fastmem_exclusives) { if (!Settings::values.cpuopt_fastmem_exclusives) {