summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar ameerj2021-09-24 01:21:07 -0400
committerGravatar ameerj2021-09-24 15:52:05 -0400
commit73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83 (patch)
tree31ecba073091bae2a424f3d0b6215591408edca3 /src/core/hle/kernel
parentci: Update clang format version (diff)
downloadyuzu-73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83.tar.gz
yuzu-73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83.tar.xz
yuzu-73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83.zip
general: Update style to clang-format-12
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/k_priority_queue.h27
-rw-r--r--src/core/hle/kernel/k_scheduler.h2
-rw-r--r--src/core/hle/kernel/k_scoped_lock.h15
-rw-r--r--src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h2
4 files changed, 19 insertions, 27 deletions
diff --git a/src/core/hle/kernel/k_priority_queue.h b/src/core/hle/kernel/k_priority_queue.h
index 4aa669d95..f4d71ad7e 100644
--- a/src/core/hle/kernel/k_priority_queue.h
+++ b/src/core/hle/kernel/k_priority_queue.h
@@ -22,12 +22,10 @@ class KThread;
22 22
23template <typename T> 23template <typename T>
24concept KPriorityQueueAffinityMask = !std::is_reference_v<T> && requires(T & t) { 24concept KPriorityQueueAffinityMask = !std::is_reference_v<T> && requires(T & t) {
25 { t.GetAffinityMask() } 25 { t.GetAffinityMask() } -> Common::ConvertibleTo<u64>;
26 ->Common::ConvertibleTo<u64>;
27 {t.SetAffinityMask(0)}; 26 {t.SetAffinityMask(0)};
28 27
29 { t.GetAffinity(0) } 28 { t.GetAffinity(0) } -> std::same_as<bool>;
30 ->std::same_as<bool>;
31 {t.SetAffinity(0, false)}; 29 {t.SetAffinity(0, false)};
32 {t.SetAll()}; 30 {t.SetAll()};
33}; 31};
@@ -38,25 +36,20 @@ concept KPriorityQueueMember = !std::is_reference_v<T> && requires(T & t) {
38 {(typename T::QueueEntry()).Initialize()}; 36 {(typename T::QueueEntry()).Initialize()};
39 {(typename T::QueueEntry()).SetPrev(std::addressof(t))}; 37 {(typename T::QueueEntry()).SetPrev(std::addressof(t))};
40 {(typename T::QueueEntry()).SetNext(std::addressof(t))}; 38 {(typename T::QueueEntry()).SetNext(std::addressof(t))};
41 { (typename T::QueueEntry()).GetNext() } 39 { (typename T::QueueEntry()).GetNext() } -> std::same_as<T*>;
42 ->std::same_as<T*>; 40 { (typename T::QueueEntry()).GetPrev() } -> std::same_as<T*>;
43 { (typename T::QueueEntry()).GetPrev() } 41 { t.GetPriorityQueueEntry(0) } -> std::same_as<typename T::QueueEntry&>;
44 ->std::same_as<T*>;
45 { t.GetPriorityQueueEntry(0) }
46 ->std::same_as<typename T::QueueEntry&>;
47 42
48 {t.GetAffinityMask()}; 43 {t.GetAffinityMask()};
49 { std::remove_cvref_t<decltype(t.GetAffinityMask())>() } 44 { std::remove_cvref_t<decltype(t.GetAffinityMask())>() } -> KPriorityQueueAffinityMask;
50 ->KPriorityQueueAffinityMask;
51 45
52 { t.GetActiveCore() } 46 { t.GetActiveCore() } -> Common::ConvertibleTo<s32>;
53 ->Common::ConvertibleTo<s32>; 47 { t.GetPriority() } -> Common::ConvertibleTo<s32>;
54 { t.GetPriority() }
55 ->Common::ConvertibleTo<s32>;
56}; 48};
57 49
58template <typename Member, size_t NumCores_, int LowestPriority, int HighestPriority> 50template <typename Member, size_t NumCores_, int LowestPriority, int HighestPriority>
59requires KPriorityQueueMember<Member> class KPriorityQueue { 51requires KPriorityQueueMember<Member>
52class KPriorityQueue {
60public: 53public:
61 using AffinityMaskType = std::remove_cv_t< 54 using AffinityMaskType = std::remove_cv_t<
62 std::remove_reference_t<decltype(std::declval<Member>().GetAffinityMask())>>; 55 std::remove_reference_t<decltype(std::declval<Member>().GetAffinityMask())>>;
diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h
index 12cfae919..c8ccc1ae4 100644
--- a/src/core/hle/kernel/k_scheduler.h
+++ b/src/core/hle/kernel/k_scheduler.h
@@ -197,7 +197,7 @@ private:
197 197
198class [[nodiscard]] KScopedSchedulerLock : KScopedLock<GlobalSchedulerContext::LockType> { 198class [[nodiscard]] KScopedSchedulerLock : KScopedLock<GlobalSchedulerContext::LockType> {
199public: 199public:
200 explicit KScopedSchedulerLock(KernelCore & kernel); 200 explicit KScopedSchedulerLock(KernelCore& kernel);
201 ~KScopedSchedulerLock(); 201 ~KScopedSchedulerLock();
202}; 202};
203 203
diff --git a/src/core/hle/kernel/k_scoped_lock.h b/src/core/hle/kernel/k_scoped_lock.h
index 72c3b0252..4fb180fc6 100644
--- a/src/core/hle/kernel/k_scoped_lock.h
+++ b/src/core/hle/kernel/k_scoped_lock.h
@@ -13,19 +13,18 @@ namespace Kernel {
13 13
14template <typename T> 14template <typename T>
15concept KLockable = !std::is_reference_v<T> && requires(T & t) { 15concept KLockable = !std::is_reference_v<T> && requires(T & t) {
16 { t.Lock() } 16 { t.Lock() } -> std::same_as<void>;
17 ->std::same_as<void>; 17 { t.Unlock() } -> std::same_as<void>;
18 { t.Unlock() }
19 ->std::same_as<void>;
20}; 18};
21 19
22template <typename T> 20template <typename T>
23requires KLockable<T> class [[nodiscard]] KScopedLock { 21requires KLockable<T>
22class [[nodiscard]] KScopedLock {
24public: 23public:
25 explicit KScopedLock(T * l) : lock_ptr(l) { 24 explicit KScopedLock(T* l) : lock_ptr(l) {
26 this->lock_ptr->Lock(); 25 this->lock_ptr->Lock();
27 } 26 }
28 explicit KScopedLock(T & l) : KScopedLock(std::addressof(l)) {} 27 explicit KScopedLock(T& l) : KScopedLock(std::addressof(l)) {}
29 28
30 ~KScopedLock() { 29 ~KScopedLock() {
31 this->lock_ptr->Unlock(); 30 this->lock_ptr->Unlock();
@@ -34,7 +33,7 @@ public:
34 KScopedLock(const KScopedLock&) = delete; 33 KScopedLock(const KScopedLock&) = delete;
35 KScopedLock& operator=(const KScopedLock&) = delete; 34 KScopedLock& operator=(const KScopedLock&) = delete;
36 35
37 KScopedLock(KScopedLock &&) = delete; 36 KScopedLock(KScopedLock&&) = delete;
38 KScopedLock& operator=(KScopedLock&&) = delete; 37 KScopedLock& operator=(KScopedLock&&) = delete;
39 38
40private: 39private:
diff --git a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h
index a86af56dd..f6c75f2d9 100644
--- a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h
+++ b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h
@@ -17,7 +17,7 @@ namespace Kernel {
17 17
18class [[nodiscard]] KScopedSchedulerLockAndSleep { 18class [[nodiscard]] KScopedSchedulerLockAndSleep {
19public: 19public:
20 explicit KScopedSchedulerLockAndSleep(KernelCore & kernel_, KThread * t, s64 timeout) 20 explicit KScopedSchedulerLockAndSleep(KernelCore& kernel_, KThread* t, s64 timeout)
21 : kernel(kernel_), thread(t), timeout_tick(timeout) { 21 : kernel(kernel_), thread(t), timeout_tick(timeout) {
22 // Lock the scheduler. 22 // Lock the scheduler.
23 kernel.GlobalSchedulerContext().scheduler_lock.Lock(); 23 kernel.GlobalSchedulerContext().scheduler_lock.Lock();