summaryrefslogtreecommitdiff
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorGravatar Merry2024-01-27 21:36:39 +0000
committerGravatar Merry2024-01-27 21:36:39 +0000
commit9f91d310c6a79bb0f5f681e931edf29158895311 (patch)
treefff7a04ba918c76c8631755f34ec02d656ab4d43 /src/core/memory.cpp
parentatomic_ops: Reduce code duplication with templates (diff)
downloadyuzu-9f91d310c6a79bb0f5f681e931edf29158895311.tar.gz
yuzu-9f91d310c6a79bb0f5f681e931edf29158895311.tar.xz
yuzu-9f91d310c6a79bb0f5f681e931edf29158895311.zip
atomic_ops: Remove volatile qualifier
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 1c218566f..e10a4601e 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -781,8 +781,7 @@ struct Memory::Impl {
781 }, 781 },
782 [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(T)); }); 782 [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(T)); });
783 if (ptr) { 783 if (ptr) {
784 const auto volatile_pointer = reinterpret_cast<volatile T*>(ptr); 784 return Common::AtomicCompareAndSwap(reinterpret_cast<T*>(ptr), data, expected);
785 return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);
786 } 785 }
787 return true; 786 return true;
788 } 787 }
@@ -796,8 +795,7 @@ struct Memory::Impl {
796 }, 795 },
797 [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(u128)); }); 796 [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(u128)); });
798 if (ptr) { 797 if (ptr) {
799 const auto volatile_pointer = reinterpret_cast<volatile u64*>(ptr); 798 return Common::AtomicCompareAndSwap(reinterpret_cast<u64*>(ptr), data, expected);
800 return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);
801 } 799 }
802 return true; 800 return true;
803 } 801 }