yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

atomic_ops: Remove volatile qualifier

This commit is contained in:
Merry 2024-01-27 21:36:39 +00:00
parent 6527c0d2fc
commit 9f91d310c6
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/atomic_ops.h
View File

@ -16,32 +16,31 @@ namespace Common {
#if _MSC_VER #if _MSC_VER
template <typename T> template <typename T>
[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected); [[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected);
template <typename T> template <typename T>
[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected, T& actual); [[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected, T& actual);
template [[nodiscard]] inline bool AtomicCompareAndSwap<u8>(volatile u8* pointer, u8 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u8>(u8* pointer, u8 value, u8 expected) {
u8 expected) {
const u8 result = const u8 result =
_InterlockedCompareExchange8(reinterpret_cast<volatile char*>(pointer), value, expected); _InterlockedCompareExchange8(reinterpret_cast<volatile char*>(pointer), value, expected);
return result == expected; return result == expected;
} }
template [[nodiscard]] inline bool AtomicCompareAndSwap<u16>(volatile u16* pointer, u16 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u16>(u16* pointer, u16 value,
u16 expected) { u16 expected) {
const u16 result = const u16 result =
_InterlockedCompareExchange16(reinterpret_cast<volatile short*>(pointer), value, expected); _InterlockedCompareExchange16(reinterpret_cast<volatile short*>(pointer), value, expected);
return result == expected; return result == expected;
} }
template [[nodiscard]] inline bool AtomicCompareAndSwap<u32>(volatile u32* pointer, u32 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u32>(u32* pointer, u32 value,
u32 expected) { u32 expected) {
const u32 result = const u32 result =
_InterlockedCompareExchange(reinterpret_cast<volatile long*>(pointer), value, expected); _InterlockedCompareExchange(reinterpret_cast<volatile long*>(pointer), value, expected);
return result == expected; return result == expected;
} }
template [[nodiscard]] inline bool AtomicCompareAndSwap<u64>(volatile u64* pointer, u64 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u64>(u64* pointer, u64 value,
u64 expected) { u64 expected) {
const u64 result = _InterlockedCompareExchange64(reinterpret_cast<volatile __int64*>(pointer), const u64 result = _InterlockedCompareExchange64(reinterpret_cast<volatile __int64*>(pointer),
value, expected); value, expected);
@ -54,29 +53,29 @@ template [[nodiscard]] inline bool AtomicCompareAndSwap<u64>(volatile u64* point
reinterpret_cast<__int64*>(expected.data())) != 0; reinterpret_cast<__int64*>(expected.data())) != 0;
} }
template [[nodiscard]] inline bool AtomicCompareAndSwap<u8>(volatile u8* pointer, u8 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u8>(u8* pointer, u8 value, u8 expected,
u8 expected, u8& actual) { u8& actual) {
actual = actual =
_InterlockedCompareExchange8(reinterpret_cast<volatile char*>(pointer), value, expected); _InterlockedCompareExchange8(reinterpret_cast<volatile char*>(pointer), value, expected);
return actual == expected; return actual == expected;
} }
template [[nodiscard]] inline bool AtomicCompareAndSwap<u16>(volatile u16* pointer, u16 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u16>(u16* pointer, u16 value, u16 expected,
u16 expected, u16& actual) { u16& actual) {
actual = actual =
_InterlockedCompareExchange16(reinterpret_cast<volatile short*>(pointer), value, expected); _InterlockedCompareExchange16(reinterpret_cast<volatile short*>(pointer), value, expected);
return actual == expected; return actual == expected;
} }
template [[nodiscard]] inline bool AtomicCompareAndSwap<u32>(volatile u32* pointer, u32 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u32>(u32* pointer, u32 value, u32 expected,
u32 expected, u32& actual) { u32& actual) {
actual = actual =
_InterlockedCompareExchange(reinterpret_cast<volatile long*>(pointer), value, expected); _InterlockedCompareExchange(reinterpret_cast<volatile long*>(pointer), value, expected);
return actual == expected; return actual == expected;
} }
template [[nodiscard]] inline bool AtomicCompareAndSwap<u64>(volatile u64* pointer, u64 value, template [[nodiscard]] inline bool AtomicCompareAndSwap<u64>(u64* pointer, u64 value, u64 expected,
u64 expected, u64& actual) { u64& actual) {
actual = _InterlockedCompareExchange64(reinterpret_cast<volatile __int64*>(pointer), value, actual = _InterlockedCompareExchange64(reinterpret_cast<volatile __int64*>(pointer), value,
expected); expected);
return actual == expected; return actual == expected;
@ -101,11 +100,11 @@ template [[nodiscard]] inline bool AtomicCompareAndSwap<u64>(volatile u64* point
#else #else
template <typename T> template <typename T>
[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected) { [[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected) {
return __sync_bool_compare_and_swap(pointer, expected, value); return __sync_bool_compare_and_swap(pointer, expected, value);
} }
[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u128 value, u128 expected) { [[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u128 value, u128 expected) {
unsigned __int128 value_a; unsigned __int128 value_a;
unsigned __int128 expected_a; unsigned __int128 expected_a;
std::memcpy(&value_a, value.data(), sizeof(u128)); std::memcpy(&value_a, value.data(), sizeof(u128));
@ -114,13 +113,12 @@ template <typename T>
} }
template <typename T> template <typename T>
[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected, [[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected, T& actual) {
T& actual) {
actual = __sync_val_compare_and_swap(pointer, expected, value); actual = __sync_val_compare_and_swap(pointer, expected, value);
return actual == expected; return actual == expected;
} }
[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u128 value, u128 expected, [[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u128 value, u128 expected,
u128& actual) { u128& actual) {
unsigned __int128 value_a; unsigned __int128 value_a;
unsigned __int128 expected_a; unsigned __int128 expected_a;
@ -132,7 +130,7 @@ template <typename T>
return actual_a == expected_a; return actual_a == expected_a;
} }
[[nodiscard]] inline u128 AtomicLoad128(volatile u64* pointer) { [[nodiscard]] inline u128 AtomicLoad128(u64* pointer) {
unsigned __int128 zeros_a = 0; unsigned __int128 zeros_a = 0;
unsigned __int128 result_a = unsigned __int128 result_a =
__sync_val_compare_and_swap((unsigned __int128*)pointer, zeros_a, zeros_a); __sync_val_compare_and_swap((unsigned __int128*)pointer, zeros_a, zeros_a);

6
src/core/memory.cpp
View File

@ -781,8 +781,7 @@ struct Memory::Impl {
}, },
[&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(T)); }); [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(T)); });
if (ptr) { if (ptr) {
const auto volatile_pointer = reinterpret_cast<volatile T*>(ptr); return Common::AtomicCompareAndSwap(reinterpret_cast<T*>(ptr), data, expected);
return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);
} }
return true; return true;
} }
@ -796,8 +795,7 @@ struct Memory::Impl {
}, },
[&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(u128)); }); [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(u128)); });
if (ptr) { if (ptr) {
const auto volatile_pointer = reinterpret_cast<volatile u64*>(ptr); return Common::AtomicCompareAndSwap(reinterpret_cast<u64*>(ptr), data, expected);
return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);
} }
return true; return true;
} }