From 8b830b310bb7d07e50c2c8bece6d51157cdc05e8 Mon Sep 17 00:00:00 2001
From: Zephyron <zephyron@citron-emu.org>
Date: Tue, 7 Oct 2025 15:45:56 +1000
Subject: [PATCH] fix(dynarmic): Remove MSVC-specific fastmem_pointer
 assignments

Unify fastmem_pointer handling by using reinterpret_cast<uintptr_t>()
and std::nullopt consistently across all platforms, fixing MSVC
compilation errors with std::optional<uintptr_t> assignment.

Fixes: C2679 binary '=' operator errors on MSVC
Signed-off-by: Zephyron <zephyron@citron-emu.org>
---
 src/core/arm/dynarmic/arm_dynarmic_32.cpp | 12 ++----------
 src/core/arm/dynarmic/arm_dynarmic_64.cpp | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

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<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;
 
-#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_pointer = reinterpret_cast<uintptr_t>(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<Dynarmic::A32::Jit> 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<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;
 
-#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_pointer = reinterpret_cast<uintptr_t>(page_table->fastmem_arena);
         config.fastmem_address_space_bits = address_space_bits;
         config.silently_mirror_fastmem = false;
 
@@ -315,11 +311,7 @@ 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) {
-#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) {