summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-08-22 23:45:47 +0200
committerGitHub <noreply@github.com>2017-08-22 23:45:47 +0200
commit2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5 (patch)
tree160cf2ee466c82223a3527f01cd0b25b1e5c3225
parentMerge pull request #2888 from Subv/warnings (diff)
parentKernel/Threads: Don't immediately switch to the new main thread when loading a new process. (diff)
downloadyuzu-2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5.tar
yuzu-2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5.tar.gz
yuzu-2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5.tar.bz2
yuzu-2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5.tar.lz
yuzu-2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5.tar.xz
yuzu-2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5.tar.zst
yuzu-2bbff9fa962ffb3e03116e51ba8fb1778a4d10e5.zip
-rw-r--r--src/core/hle/kernel/thread.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index f5f2eb2f7..b957c45dd 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -478,8 +478,6 @@ void Thread::BoostPriority(s32 priority) {
}
SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority) {
- DEBUG_ASSERT(!GetCurrentThread());
-
// Initialize new "main" thread
auto thread_res = Thread::Create("main", entry_point, priority, 0, THREADPROCESSORID_0,
Memory::HEAP_VADDR_END);
@@ -489,9 +487,7 @@ SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority) {
thread->context.fpscr =
FPSCR_DEFAULT_NAN | FPSCR_FLUSH_TO_ZERO | FPSCR_ROUND_TOZERO | FPSCR_IXC; // 0x03C00010
- // Run new "main" thread
- SwitchContext(thread.get());
-
+ // Note: The newly created thread will be run when the scheduler fires.
return thread;
}