diff options
| -rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index 8353308aa..9a38fa50c 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp | |||
| @@ -251,7 +251,7 @@ void GlobalScheduler::PreemptThreads() { | |||
| 251 | if (winner->IsRunning()) { | 251 | if (winner->IsRunning()) { |
| 252 | UnloadThread(winner->GetProcessorID()); | 252 | UnloadThread(winner->GetProcessorID()); |
| 253 | } | 253 | } |
| 254 | TransferToCore(winner->GetPriority(), core_id, winner); | 254 | TransferToCore(winner->GetPriority(), s32(core_id), winner); |
| 255 | current_thread = | 255 | current_thread = |
| 256 | winner->GetPriority() <= current_thread->GetPriority() ? winner : current_thread; | 256 | winner->GetPriority() <= current_thread->GetPriority() ? winner : current_thread; |
| 257 | } | 257 | } |
| @@ -284,7 +284,7 @@ void GlobalScheduler::PreemptThreads() { | |||
| 284 | if (winner->IsRunning()) { | 284 | if (winner->IsRunning()) { |
| 285 | UnloadThread(winner->GetProcessorID()); | 285 | UnloadThread(winner->GetProcessorID()); |
| 286 | } | 286 | } |
| 287 | TransferToCore(winner->GetPriority(), core_id, winner); | 287 | TransferToCore(winner->GetPriority(), s32(core_id), winner); |
| 288 | current_thread = winner; | 288 | current_thread = winner; |
| 289 | } | 289 | } |
| 290 | } | 290 | } |
| @@ -302,12 +302,12 @@ void GlobalScheduler::Unsuggest(u32 priority, u32 core, Thread* thread) { | |||
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | void GlobalScheduler::Schedule(u32 priority, u32 core, Thread* thread) { | 304 | void GlobalScheduler::Schedule(u32 priority, u32 core, Thread* thread) { |
| 305 | ASSERT_MSG(thread->GetProcessorID() == core, "Thread must be assigned to this core."); | 305 | ASSERT_MSG(thread->GetProcessorID() == s32(core), "Thread must be assigned to this core."); |
| 306 | scheduled_queue[core].add(thread, priority); | 306 | scheduled_queue[core].add(thread, priority); |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | void GlobalScheduler::SchedulePrepend(u32 priority, u32 core, Thread* thread) { | 309 | void GlobalScheduler::SchedulePrepend(u32 priority, u32 core, Thread* thread) { |
| 310 | ASSERT_MSG(thread->GetProcessorID() == core, "Thread must be assigned to this core."); | 310 | ASSERT_MSG(thread->GetProcessorID() == s32(core), "Thread must be assigned to this core."); |
| 311 | scheduled_queue[core].add(thread, priority, false); | 311 | scheduled_queue[core].add(thread, priority, false); |
| 312 | } | 312 | } |
| 313 | 313 | ||
| @@ -439,7 +439,7 @@ void Scheduler::SwitchContext() { | |||
| 439 | 439 | ||
| 440 | // Load context of new thread | 440 | // Load context of new thread |
| 441 | if (new_thread) { | 441 | if (new_thread) { |
| 442 | ASSERT_MSG(new_thread->GetProcessorID() == this->core_id, | 442 | ASSERT_MSG(new_thread->GetProcessorID() == s32(this->core_id), |
| 443 | "Thread must be assigned to this core."); | 443 | "Thread must be assigned to this core."); |
| 444 | ASSERT_MSG(new_thread->GetStatus() == ThreadStatus::Ready, | 444 | ASSERT_MSG(new_thread->GetStatus() == ThreadStatus::Ready, |
| 445 | "Thread must be ready to become running."); | 445 | "Thread must be ready to become running."); |