From a5ab85ac37bbfed739e75ba9c2226b1e6bf1fd37 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 5 Mar 2021 17:08:17 -0800 Subject: Revert "core: Switch to unique_ptr for usage of Common::Fiber." --- src/core/hle/kernel/k_scheduler.cpp | 18 +++++++++--------- src/core/hle/kernel/k_scheduler.h | 10 +++++----- src/core/hle/kernel/k_thread.cpp | 6 +++++- src/core/hle/kernel/k_thread.h | 10 ++-------- src/core/hle/kernel/svc.cpp | 3 ++- 5 files changed, 23 insertions(+), 24 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index 465036f3d..bb5f43b53 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -608,7 +608,7 @@ void KScheduler::YieldToAnyThread(KernelCore& kernel) { } KScheduler::KScheduler(Core::System& system, s32 core_id) : system(system), core_id(core_id) { - switch_fiber = std::make_unique(OnSwitch, this); + switch_fiber = std::make_shared(OnSwitch, this); state.needs_scheduling.store(true); state.interrupt_task_thread_runnable = false; state.should_count_idle = false; @@ -726,15 +726,15 @@ void KScheduler::ScheduleImpl() { // Save context for previous thread Unload(previous_thread); - Common::Fiber* old_context; + std::shared_ptr* old_context; if (previous_thread != nullptr) { - old_context = previous_thread->GetHostContext(); + old_context = &previous_thread->GetHostContext(); } else { - old_context = idle_thread->GetHostContext(); + old_context = &idle_thread->GetHostContext(); } guard.unlock(); - Common::Fiber::YieldTo(old_context, switch_fiber.get()); + Common::Fiber::YieldTo(*old_context, switch_fiber); /// When a thread wakes up, the scheduler may have changed to other in another core. auto& next_scheduler = *system.Kernel().CurrentScheduler(); next_scheduler.SwitchContextStep2(); @@ -769,13 +769,13 @@ void KScheduler::SwitchToCurrent() { break; } } - Common::Fiber* next_context; + std::shared_ptr* next_context; if (next_thread != nullptr) { - next_context = next_thread->GetHostContext(); + next_context = &next_thread->GetHostContext(); } else { - next_context = idle_thread->GetHostContext(); + next_context = &idle_thread->GetHostContext(); } - Common::Fiber::YieldTo(switch_fiber.get(), next_context); + Common::Fiber::YieldTo(switch_fiber, *next_context); } while (!is_switch_pending()); } } diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index a4285c595..f595b9a5c 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h @@ -68,12 +68,12 @@ public: void OnThreadStart(); - [[nodiscard]] Common::Fiber* ControlContext() { - return switch_fiber.get(); + [[nodiscard]] std::shared_ptr& ControlContext() { + return switch_fiber; } - [[nodiscard]] const Common::Fiber* ControlContext() const { - return switch_fiber.get(); + [[nodiscard]] const std::shared_ptr& ControlContext() const { + return switch_fiber; } [[nodiscard]] u64 UpdateHighestPriorityThread(KThread* highest_thread); @@ -178,7 +178,7 @@ private: KThread* idle_thread; - std::unique_ptr switch_fiber{}; + std::shared_ptr switch_fiber{}; struct SchedulingState { std::atomic needs_scheduling; diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index f49e31b72..1661afbd9 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -991,6 +991,10 @@ void KThread::SetState(ThreadState state) { } } +std::shared_ptr& KThread::GetHostContext() { + return host_context; +} + ResultVal> KThread::Create(Core::System& system, ThreadType type_flags, std::string name, VAddr entry_point, u32 priority, u64 arg, s32 processor_id, @@ -1024,7 +1028,7 @@ ResultVal> KThread::Create(Core::System& system, Thread scheduler.AddThread(thread); thread->host_context = - std::make_unique(std::move(thread_start_func), thread_start_parameter); + std::make_shared(std::move(thread_start_func), thread_start_parameter); return MakeResult>(std::move(thread)); } diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index a2893d939..c8ac656a4 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -293,13 +293,7 @@ public: return thread_context_64; } - [[nodiscard]] Common::Fiber* GetHostContext() { - return host_context.get(); - } - - [[nodiscard]] const Common::Fiber* GetHostContext() const { - return host_context.get(); - } + [[nodiscard]] std::shared_ptr& GetHostContext(); [[nodiscard]] ThreadState GetState() const { return thread_state & ThreadState::Mask; @@ -725,7 +719,7 @@ private: Common::SpinLock context_guard{}; // For emulation - std::unique_ptr host_context{}; + std::shared_ptr host_context{}; // For debugging std::vector wait_objects_for_debugging; diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index d04116115..cc8fa6576 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -2626,7 +2626,8 @@ void Call(Core::System& system, u32 immediate) { kernel.ExitSVCProfile(); if (!thread->IsCallingSvc()) { - thread->GetHostContext()->Rewind(); + auto* host_context = thread->GetHostContext().get(); + host_context->Rewind(); } system.EnterDynarmicProfile(); -- cgit v1.2.3