VERY experimental Nintendo Switch 2 emulator
C++
kernel: remove general boost lists
Liam370a0526a5a5
diff --git a/src/core/hle/kernel/k_event_info.h b/src/core/hle/kernel/k_event_info.hindex 25b3ff594b..eacfa5dc61 100644--- a/src/core/hle/kernel/k_event_info.h+++ b/src/core/hle/kernel/k_event_info.h@@ -5,14 +5,15 @@#include <array>-#include <boost/intrusive/list.hpp>+#include "common/intrusive_list.h"#include "core/hle/kernel/slab_helpers.h"#include "core/hle/kernel/svc_types.h"namespace Kernel {-class KEventInfo : public KSlabAllocated<KEventInfo>, public boost::intrusive::list_base_hook<> {+class KEventInfo : public KSlabAllocated<KEventInfo>,+ public Common::IntrusiveListBaseNode<KEventInfo> {public:struct InfoCreateThread {u32 thread_id{};diff --git a/src/core/hle/kernel/k_object_name.h b/src/core/hle/kernel/k_object_name.hindex 2d97fc7777..a8876fe370 100644--- a/src/core/hle/kernel/k_object_name.h+++ b/src/core/hle/kernel/k_object_name.h@@ -5,7 +5,8 @@#include <array>#include <memory>-#include <boost/intrusive/list.hpp>++#include "common/intrusive_list.h"#include "core/hle/kernel/k_light_lock.h"#include "core/hle/kernel/slab_helpers.h"@@ -15,13 +16,14 @@ namespace Kernel {class KObjectNameGlobalData;-class KObjectName : public KSlabAllocated<KObjectName>, public boost::intrusive::list_base_hook<> {+class KObjectName : public KSlabAllocated<KObjectName>,+ public Common::IntrusiveListBaseNode<KObjectName> {public:explicit KObjectName(KernelCore&) {}virtual ~KObjectName() = default;static constexpr size_t NameLengthMax = 12;- using List = boost::intrusive::list<KObjectName>;+ using List = Common::IntrusiveListBaseTraits<KObjectName>::ListType;static Result NewFromName(KernelCore& kernel, KAutoObject* obj, const char* name);static Result Delete(KernelCore& kernel, KAutoObject* obj, const char* name);diff --git a/src/core/hle/kernel/k_server_port.h b/src/core/hle/kernel/k_server_port.hindex 21c040e620..625280290b 100644--- a/src/core/hle/kernel/k_server_port.h+++ b/src/core/hle/kernel/k_server_port.h@@ -7,7 +7,7 @@#include <string>#include <utility>-#include <boost/intrusive/list.hpp>+#include "common/intrusive_list.h"#include "core/hle/kernel/k_server_session.h"#include "core/hle/kernel/k_synchronization_object.h"@@ -42,7 +42,7 @@ public:bool IsSignaled() const override;private:- using SessionList = boost::intrusive::list<KServerSession>;+ using SessionList = Common::IntrusiveListBaseTraits<KServerSession>::ListType;void CleanupSessions();diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.hindex 5ee02f556b..4038919194 100644--- a/src/core/hle/kernel/k_server_session.h+++ b/src/core/hle/kernel/k_server_session.h@@ -8,7 +8,7 @@#include <string>#include <utility>-#include <boost/intrusive/list.hpp>+#include "common/intrusive_list.h"#include "core/hle/kernel/k_light_lock.h"#include "core/hle/kernel/k_session_request.h"@@ -27,7 +27,7 @@ class KSession;class KThread;class KServerSession final : public KSynchronizationObject,- public boost::intrusive::list_base_hook<> {+ public Common::IntrusiveListBaseNode<KServerSession> {KERNEL_AUTOOBJECT_TRAITS(KServerSession, KSynchronizationObject);friend class ServiceThread;@@ -67,7 +67,8 @@ private:KSession* m_parent{};/// List of threads which are pending a reply.- boost::intrusive::list<KSessionRequest> m_request_list{};+ using RequestList = Common::IntrusiveListBaseTraits<KSessionRequest>::ListType;+ RequestList m_request_list{};KSessionRequest* m_current_request{};KLightLock m_lock;diff --git a/src/core/hle/kernel/k_session_request.h b/src/core/hle/kernel/k_session_request.hindex b5f04907bd..283669e0ac 100644--- a/src/core/hle/kernel/k_session_request.h+++ b/src/core/hle/kernel/k_session_request.h@@ -5,6 +5,8 @@#include <array>+#include "common/intrusive_list.h"+#include "core/hle/kernel/k_auto_object.h"#include "core/hle/kernel/k_event.h"#include "core/hle/kernel/k_memory_block.h"@@ -16,7 +18,7 @@ namespace Kernel {class KSessionRequest final : public KSlabAllocated<KSessionRequest>,public KAutoObject,- public boost::intrusive::list_base_hook<> {+ public Common::IntrusiveListBaseNode<KSessionRequest> {KERNEL_AUTOOBJECT_TRAITS(KSessionRequest, KAutoObject);public:diff --git a/src/core/hle/kernel/k_shared_memory_info.h b/src/core/hle/kernel/k_shared_memory_info.hindex 75b73ba390..2d8ff20d6d 100644--- a/src/core/hle/kernel/k_shared_memory_info.h+++ b/src/core/hle/kernel/k_shared_memory_info.h@@ -3,7 +3,7 @@#pragma once-#include <boost/intrusive/list.hpp>+#include "common/intrusive_list.h"#include "core/hle/kernel/slab_helpers.h"@@ -12,7 +12,7 @@ namespace Kernel {class KSharedMemory;class KSharedMemoryInfo final : public KSlabAllocated<KSharedMemoryInfo>,- public boost::intrusive::list_base_hook<> {+ public Common::IntrusiveListBaseNode<KSharedMemoryInfo> {public:explicit KSharedMemoryInfo(KernelCore&) {}diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.hindex 9c1a41128a..f9814ac8f6 100644--- a/src/core/hle/kernel/k_thread.h+++ b/src/core/hle/kernel/k_thread.h@@ -12,7 +12,7 @@#include <utility>#include <vector>-#include <boost/intrusive/list.hpp>+#include "common/intrusive_list.h"#include "common/intrusive_red_black_tree.h"#include "common/spin_lock.h"@@ -119,7 +119,7 @@ s32 GetCurrentCoreId(KernelCore& kernel);Core::Memory::Memory& GetCurrentMemory(KernelCore& kernel);class KThread final : public KAutoObjectWithSlabHeapAndContainer<KThread, KWorkerTask>,- public boost::intrusive::list_base_hook<>,+ public Common::IntrusiveListBaseNode<KThread>,public KTimerTask {KERNEL_AUTOOBJECT_TRAITS(KThread, KSynchronizationObject);@@ -138,7 +138,7 @@ public:public:using ThreadContext32 = Core::ARM_Interface::ThreadContext32;using ThreadContext64 = Core::ARM_Interface::ThreadContext64;- using WaiterList = boost::intrusive::list<KThread>;+ using WaiterList = Common::IntrusiveListBaseTraits<KThread>::ListType;/*** Gets the thread's current priority@@ -750,8 +750,9 @@ private:ConditionVariableThreadTreeTraits::TreeType<LockWithPriorityInheritanceComparator>;public:- class LockWithPriorityInheritanceInfo : public KSlabAllocated<LockWithPriorityInheritanceInfo>,- public boost::intrusive::list_base_hook<> {+ class LockWithPriorityInheritanceInfo+ : public KSlabAllocated<LockWithPriorityInheritanceInfo>,+ public Common::IntrusiveListBaseNode<LockWithPriorityInheritanceInfo> {public:explicit LockWithPriorityInheritanceInfo(KernelCore&) {}@@ -839,7 +840,7 @@ public:private:using LockWithPriorityInheritanceInfoList =- boost::intrusive::list<LockWithPriorityInheritanceInfo>;+ Common::IntrusiveListBaseTraits<LockWithPriorityInheritanceInfo>::ListType;ConditionVariableThreadTree* m_condvar_tree{};u64 m_condvar_key{};