drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2026-01-09 11:14:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'msvc_compilation_fix' into 'main'

Browse Source 
fix(MSVC): Compilation Error

See merge request citron/emulator!88
This commit is contained in:
Zephyron
2025-10-07 15:04:54 +10:00
parent 8f38c83a2e 32ea5f0fd0
commit 32ab431ebf
2 changed files with 20 additions and 4 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.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.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;
}
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;
}
if (!Settings::values.cpuopt_fastmem_exclusives) {

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

@@ -240,7 +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.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_address_space_bits = address_space_bits;
config.silently_mirror_fastmem = false;
@@ -311,7 +315,11 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* pa
config.only_detect_misalignment_via_page_table_on_page_boundary = false;
}
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;
}
if (!Settings::values.cpuopt_fastmem_exclusives) {