From bc1399204b914608715306a8a8dbe2f201dd4365 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 9 Nov 2021 19:02:11 -0800
Subject: hle: kernel: Update KThreadQueue and migrate KSynchronizationObject.

---
 src/core/hle/kernel/k_synchronization_object.h | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'src/core/hle/kernel/k_synchronization_object.h')

diff --git a/src/core/hle/kernel/k_synchronization_object.h b/src/core/hle/kernel/k_synchronization_object.h
index 898e58e16..789ff4780 100644
--- a/src/core/hle/kernel/k_synchronization_object.h
+++ b/src/core/hle/kernel/k_synchronization_object.h
@@ -35,6 +35,38 @@ public:
 
     [[nodiscard]] std::vector<KThread*> GetWaitingThreadsForDebugging() const;
 
+    void LinkNode(ThreadListNode* node) {
+        // Link the node to the list.
+        if (thread_list_tail == nullptr) {
+            thread_list_head = node;
+        } else {
+            thread_list_tail->next = node;
+        }
+
+        thread_list_tail = node;
+    }
+
+    void UnlinkNode(ThreadListNode* node) {
+        // Unlink the node from the list.
+        ThreadListNode* prev_ptr =
+            reinterpret_cast<ThreadListNode*>(std::addressof(thread_list_head));
+        ThreadListNode* prev_val = nullptr;
+        ThreadListNode *prev, *tail_prev;
+
+        do {
+            prev = prev_ptr;
+            prev_ptr = prev_ptr->next;
+            tail_prev = prev_val;
+            prev_val = prev_ptr;
+        } while (prev_ptr != node);
+
+        if (thread_list_tail == node) {
+            thread_list_tail = tail_prev;
+        }
+
+        prev->next = node->next;
+    }
+
 protected:
     explicit KSynchronizationObject(KernelCore& kernel);
     ~KSynchronizationObject() override;
-- 
cgit v1.2.3


From 2c49a65d2be9cc18bf6e72bb09ad4ce6a8e7588f Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sun, 21 Nov 2021 02:30:16 -0800
Subject: hle: kernel: KSynchronizationObject: Fix variable shadowing.

---
 src/core/hle/kernel/k_synchronization_object.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/core/hle/kernel/k_synchronization_object.h')

diff --git a/src/core/hle/kernel/k_synchronization_object.h b/src/core/hle/kernel/k_synchronization_object.h
index 789ff4780..ec235437b 100644
--- a/src/core/hle/kernel/k_synchronization_object.h
+++ b/src/core/hle/kernel/k_synchronization_object.h
@@ -35,18 +35,18 @@ public:
 
     [[nodiscard]] std::vector<KThread*> GetWaitingThreadsForDebugging() const;
 
-    void LinkNode(ThreadListNode* node) {
+    void LinkNode(ThreadListNode* node_) {
         // Link the node to the list.
         if (thread_list_tail == nullptr) {
-            thread_list_head = node;
+            thread_list_head = node_;
         } else {
-            thread_list_tail->next = node;
+            thread_list_tail->next = node_;
         }
 
-        thread_list_tail = node;
+        thread_list_tail = node_;
     }
 
-    void UnlinkNode(ThreadListNode* node) {
+    void UnlinkNode(ThreadListNode* node_) {
         // Unlink the node from the list.
         ThreadListNode* prev_ptr =
             reinterpret_cast<ThreadListNode*>(std::addressof(thread_list_head));
@@ -58,13 +58,13 @@ public:
             prev_ptr = prev_ptr->next;
             tail_prev = prev_val;
             prev_val = prev_ptr;
-        } while (prev_ptr != node);
+        } while (prev_ptr != node_);
 
-        if (thread_list_tail == node) {
+        if (thread_list_tail == node_) {
             thread_list_tail = tail_prev;
         }
 
-        prev->next = node->next;
+        prev->next = node_->next;
     }
 
 protected:
-- 
cgit v1.2.3