diff options
| author | Mike Lothian <mike@fireburn.co.uk> | 2024-07-01 21:56:49 +0100 |
|---|---|---|
| committer | Mike Lothian <mike@fireburn.co.uk> | 2024-07-17 16:05:26 +0100 |
| commit | 9f4941bce23f0aab4d4ff0abcb9e4254a3d0b3b9 (patch) | |
| tree | 6f7632142c19ac24ec56b6833494438c55bb547f | |
| parent | 3d83c06aedfab877a786e080d3792eb1e21c8e83 (diff) | |
externals: Update dynarmic to 6.7.1
| m--------- | externals/dynarmic | 0 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 6 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/externals/dynarmic b/externals/dynarmic -Subproject ba8192d89078af51ae6f97c9352e3683612cdff +Subproject a41c380246d3d9f9874f0f792d234dc0cc17c18 diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 36478f722..65c4ace38 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -192,9 +192,9 @@ 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 = page_table->fastmem_arena; + config.fastmem_pointer = reinterpret_cast<uintptr_t>(page_table->fastmem_arena); - 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 +251,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) { - 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 c811c8ad5..c40ff6b83 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -239,11 +239,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 = page_table->fastmem_arena; + config.fastmem_pointer = reinterpret_cast<uintptr_t>(page_table->fastmem_arena); 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 +310,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) { - config.fastmem_pointer = nullptr; + config.fastmem_pointer = std::nullopt; config.fastmem_exclusive_access = false; } if (!Settings::values.cpuopt_fastmem_exclusives) { |