diff options
| author | 2020-05-08 18:53:13 -0400 | |
|---|---|---|
| committer | 2020-06-27 11:36:14 -0400 | |
| commit | 467d43570e10b98fa33067352d35fe62ceb3cb9e (patch) | |
| tree | 830b0a3b6bc7675ce3c988c86d000f1a4287214c /src/common | |
| parent | ARMInterface/Externals: Update dynarmic and fit to latest version. (diff) | |
| download | yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.gz yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.xz yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.zip | |
Clang Format.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/atomic_ops.cpp | 14 | ||||
| -rw-r--r-- | src/common/atomic_ops.h | 2 | ||||
| -rw-r--r-- | src/common/thread.cpp | 30 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/common/atomic_ops.cpp b/src/common/atomic_ops.cpp index 65cdfb4fd..6b2236114 100644 --- a/src/common/atomic_ops.cpp +++ b/src/common/atomic_ops.cpp | |||
| @@ -35,26 +35,26 @@ bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected) { | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) { | 37 | bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) { |
| 38 | return _InterlockedCompareExchange128((__int64*)pointer, value[1], value[0], (__int64*)expected.data()) != 0; | 38 | return _InterlockedCompareExchange128((__int64*)pointer, value[1], value[0], |
| 39 | (__int64*)expected.data()) != 0; | ||
| 39 | } | 40 | } |
| 40 | 41 | ||
| 41 | |||
| 42 | #else | 42 | #else |
| 43 | 43 | ||
| 44 | bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected) { | 44 | bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected) { |
| 45 | return __sync_bool_compare_and_swap (pointer, value, expected); | 45 | return __sync_bool_compare_and_swap(pointer, value, expected); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected) { | 48 | bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected) { |
| 49 | return __sync_bool_compare_and_swap (pointer, value, expected); | 49 | return __sync_bool_compare_and_swap(pointer, value, expected); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected) { | 52 | bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected) { |
| 53 | return __sync_bool_compare_and_swap (pointer, value, expected); | 53 | return __sync_bool_compare_and_swap(pointer, value, expected); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected) { | 56 | bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected) { |
| 57 | return __sync_bool_compare_and_swap (pointer, value, expected); | 57 | return __sync_bool_compare_and_swap(pointer, value, expected); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) { | 60 | bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) { |
| @@ -62,7 +62,7 @@ bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) { | |||
| 62 | unsigned __int128 expected_a; | 62 | unsigned __int128 expected_a; |
| 63 | std::memcpy(&value_a, value.data(), sizeof(u128)); | 63 | std::memcpy(&value_a, value.data(), sizeof(u128)); |
| 64 | std::memcpy(&expected_a, expected.data(), sizeof(u128)); | 64 | std::memcpy(&expected_a, expected.data(), sizeof(u128)); |
| 65 | return __sync_bool_compare_and_swap ((unsigned __int128*)pointer, value_a, expected_a); | 65 | return __sync_bool_compare_and_swap((unsigned __int128*)pointer, value_a, expected_a); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | #endif | 68 | #endif |
diff --git a/src/common/atomic_ops.h b/src/common/atomic_ops.h index 22cb3a402..e6181d521 100644 --- a/src/common/atomic_ops.h +++ b/src/common/atomic_ops.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | namespace Common { | 9 | namespace Common { |
| 10 | 10 | ||
| 11 | bool AtomicCompareAndSwap(u8 volatile * pointer, u8 value, u8 expected); | 11 | bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected); |
| 12 | bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected); | 12 | bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected); |
| 13 | bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected); | 13 | bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected); |
| 14 | bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected); | 14 | bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected); |
diff --git a/src/common/thread.cpp b/src/common/thread.cpp index 33c8437f5..8e5935e6a 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp | |||
| @@ -31,21 +31,21 @@ void SetCurrentThreadPriority(ThreadPriority new_priority) { | |||
| 31 | auto handle = GetCurrentThread(); | 31 | auto handle = GetCurrentThread(); |
| 32 | int windows_priority = 0; | 32 | int windows_priority = 0; |
| 33 | switch (new_priority) { | 33 | switch (new_priority) { |
| 34 | case ThreadPriority::Low: | 34 | case ThreadPriority::Low: |
| 35 | windows_priority = THREAD_PRIORITY_BELOW_NORMAL; | 35 | windows_priority = THREAD_PRIORITY_BELOW_NORMAL; |
| 36 | break; | 36 | break; |
| 37 | case ThreadPriority::Normal: | 37 | case ThreadPriority::Normal: |
| 38 | windows_priority = THREAD_PRIORITY_NORMAL; | 38 | windows_priority = THREAD_PRIORITY_NORMAL; |
| 39 | break; | 39 | break; |
| 40 | case ThreadPriority::High: | 40 | case ThreadPriority::High: |
| 41 | windows_priority = THREAD_PRIORITY_ABOVE_NORMAL; | 41 | windows_priority = THREAD_PRIORITY_ABOVE_NORMAL; |
| 42 | break; | 42 | break; |
| 43 | case ThreadPriority::VeryHigh: | 43 | case ThreadPriority::VeryHigh: |
| 44 | windows_priority = THREAD_PRIORITY_HIGHEST; | 44 | windows_priority = THREAD_PRIORITY_HIGHEST; |
| 45 | break; | 45 | break; |
| 46 | default: | 46 | default: |
| 47 | windows_priority = THREAD_PRIORITY_NORMAL; | 47 | windows_priority = THREAD_PRIORITY_NORMAL; |
| 48 | break; | 48 | break; |
| 49 | } | 49 | } |
| 50 | SetThreadPriority(handle, windows_priority); | 50 | SetThreadPriority(handle, windows_priority); |
| 51 | } | 51 | } |