artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

kernel/thread: Move thread exiting logic from ExitCurrentThread to svcExitThread

Browse source 
Puts the operation on global state in the same places as the rest of the
svc calls.
This commit is contained in:
Lioncash 2019-03-15 23:38:51 -04:00
parent c892cf01fa
commit 51d7f6bffc
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/kernel/svc.cpp
View file

@ -1284,10 +1284,14 @@ static ResultCode StartThread(Handle thread_handle) {
/// Called when a thread exits /// Called when a thread exits
static void ExitThread() { static void ExitThread() {
LOG_TRACE(Kernel_SVC, "called, pc=0x{:08X}", Core::CurrentArmInterface().GetPC()); auto& system = Core::System::GetInstance();
ExitCurrentThread(); LOG_TRACE(Kernel_SVC, "called, pc=0x{:08X}", system.CurrentArmInterface().GetPC());
Core::System::GetInstance().PrepareReschedule();
auto* const current_thread = system.CurrentScheduler().GetCurrentThread();
current_thread->Stop();
system.CurrentScheduler().RemoveThread(current_thread);
system.PrepareReschedule();
} }
/// Sleep the current thread /// Sleep the current thread

5
src/core/hle/kernel/thread.h
View file

@ -463,9 +463,4 @@ private:
*/ */
Thread* GetCurrentThread(); Thread* GetCurrentThread();
/**
* Stops the current thread and removes it from the thread_list
*/
void ExitCurrentThread();
} // namespace Kernel } // namespace Kernel