diff options
| author | bunnei <bunneidev@gmail.com> | 2021-03-05 17:08:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 17:08:48 -0800 |
| commit | 7b29a8ce4e1f94bec7e7828fb1674e1b43b937c5 (patch) | |
| tree | 503cbe4fb52939512f8ee0c976e46e9293de3c4c /src/core/hle/kernel/k_thread.cpp | |
| parent | 9d010be4837cc88e28c700f640c1c101092d482a (diff) | |
| parent | a5ab85ac37bbfed739e75ba9c2226b1e6bf1fd37 (diff) | |
Merge pull request #6039 from yuzu-emu/revert-6006-fiber-unique-ptr
Revert "core: Switch to unique_ptr for usage of Common::Fiber."
Diffstat (limited to 'src/core/hle/kernel/k_thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/k_thread.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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<Common::Fiber>& KThread::GetHostContext() { + return host_context; +} + ResultVal<std::shared_ptr<KThread>> 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<std::shared_ptr<KThread>> KThread::Create(Core::System& system, Thread scheduler.AddThread(thread); thread->host_context = - std::make_unique<Common::Fiber>(std::move(thread_start_func), thread_start_parameter); + std::make_shared<Common::Fiber>(std::move(thread_start_func), thread_start_parameter); return MakeResult<std::shared_ptr<KThread>>(std::move(thread)); } |
