diff options
| author | 2020-03-06 19:30:37 -0400 | |
|---|---|---|
| committer | 2020-06-27 11:35:30 -0400 | |
| commit | 19847d4d42e061a24086fe90d62382a1ff198322 (patch) | |
| tree | 5789d2e2fd13acb59e0ba5c969968ab352063380 /src/core/hle/kernel/scheduler.cpp | |
| parent | Core: Correct rebase. (diff) | |
| download | yuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar.gz yuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar.xz yuzu-19847d4d42e061a24086fe90d62382a1ff198322.zip | |
Scheduler: Correct assert.
Diffstat (limited to 'src/core/hle/kernel/scheduler.cpp')
| -rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index ae89e908f..4e2a5adf3 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp | |||
| @@ -606,10 +606,8 @@ void Scheduler::SwitchContextStep2() { | |||
| 606 | auto& cpu_core = system.ArmInterface(core_id); | 606 | auto& cpu_core = system.ArmInterface(core_id); |
| 607 | new_thread->context_guard.lock(); | 607 | new_thread->context_guard.lock(); |
| 608 | cpu_core.Lock(); | 608 | cpu_core.Lock(); |
| 609 | ASSERT_MSG(new_thread->GetProcessorID() == s32(this->core_id), | 609 | ASSERT_MSG(new_thread->GetSchedulingStatus() == ThreadSchedStatus::Runnable, |
| 610 | "Thread must be assigned to this core."); | 610 | "Thread must be runnable."); |
| 611 | ASSERT_MSG(new_thread->GetStatus() == ThreadStatus::Ready, | ||
| 612 | "Thread must be ready to become running."); | ||
| 613 | 611 | ||
| 614 | // Cancel any outstanding wakeup events for this thread | 612 | // Cancel any outstanding wakeup events for this thread |
| 615 | new_thread->SetIsRunning(true); | 613 | new_thread->SetIsRunning(true); |