From c98be3d79355e4913525811c9963f2702498691f Mon Sep 17 00:00:00 2001 From: Briar <205427297+icybriarr@users.noreply.github.com> Date: Wed, 2 Apr 2025 00:06:47 +0200 Subject: [PATCH] Update fastmem pointer handling to use std::optional --- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 8 +++++--- src/core/arm/dynarmic/arm_dynarmic_64.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 36478f7224..d21aa5aacf 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -192,9 +192,11 @@ 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; - config.fastmem_pointer = page_table->fastmem_arena; + config.fastmem_pointer = page_table->fastmem_arena ? + std::optional{reinterpret_cast(page_table->fastmem_arena)} : + std::nullopt; - config.fastmem_exclusive_access = config.fastmem_pointer != nullptr; + config.fastmem_exclusive_access = config.fastmem_pointer != std::nullopt; config.recompile_on_exclusive_fastmem_failure = true; } @@ -251,7 +253,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) { - config.fastmem_pointer = nullptr; + 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 c811c8ad56..c251482182 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -239,11 +239,13 @@ 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; - config.fastmem_pointer = page_table->fastmem_arena; + config.fastmem_pointer = page_table->fastmem_arena ? + std::optional{reinterpret_cast(page_table->fastmem_arena)} : + std::nullopt; config.fastmem_address_space_bits = address_space_bits; config.silently_mirror_fastmem = false; - config.fastmem_exclusive_access = config.fastmem_pointer != nullptr; + config.fastmem_exclusive_access = config.fastmem_pointer != std::nullopt; config.recompile_on_exclusive_fastmem_failure = true; } @@ -310,7 +312,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) { - config.fastmem_pointer = nullptr; + config.fastmem_pointer = std::nullopt; config.fastmem_exclusive_access = false; } if (!Settings::values.cpuopt_fastmem_exclusives) {