diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 0409fa9e7..b42ecccda 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -193,11 +193,7 @@ std::shared_ptr 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; -#ifdef _MSC_VER - config.fastmem_pointer = page_table->fastmem_arena; -#else - config.fastmem_pointer = reinterpret_cast(page_table->fastmem_arena); -#endif + config.fastmem_pointer = reinterpret_cast(page_table->fastmem_arena); config.fastmem_exclusive_access = config.fastmem_pointer.has_value(); config.recompile_on_exclusive_fastmem_failure = true; @@ -256,11 +252,7 @@ std::shared_ptr ArmDynarmic32::MakeJit(Common::PageTable* pa config.only_detect_misalignment_via_page_table_on_page_boundary = false; } if (!Settings::values.cpuopt_fastmem) { -#ifdef _MSC_VER - config.fastmem_pointer = nullptr; -#else - config.fastmem_pointer = std::nullopt; -#endif + config.fastmem_pointer = std::nullopt; config.fastmem_exclusive_access = false; } if (!Settings::values.cpuopt_fastmem_exclusives) { diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 96c0f6250..e7d3a9413 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -240,11 +240,7 @@ std::shared_ptr 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; -#ifdef _MSC_VER - config.fastmem_pointer = page_table->fastmem_arena; -#else - config.fastmem_pointer = reinterpret_cast(page_table->fastmem_arena); -#endif + config.fastmem_pointer = reinterpret_cast(page_table->fastmem_arena); config.fastmem_address_space_bits = address_space_bits; config.silently_mirror_fastmem = false; @@ -315,11 +311,7 @@ std::shared_ptr ArmDynarmic64::MakeJit(Common::PageTable* pa config.only_detect_misalignment_via_page_table_on_page_boundary = false; } if (!Settings::values.cpuopt_fastmem) { -#ifdef _MSC_VER - config.fastmem_pointer = nullptr; -#else - config.fastmem_pointer = std::nullopt; -#endif + config.fastmem_pointer = std::nullopt; config.fastmem_exclusive_access = false; } if (!Settings::values.cpuopt_fastmem_exclusives) {