diff options
| author | 2016-12-16 00:37:38 -0500 | |
|---|---|---|
| committer | 2016-12-21 23:48:13 -0500 | |
| commit | 4fc8b8229ed1d9ea9d20faee7059c898265db6cf (patch) | |
| tree | 45095e416393473fe9721c60edd9a220b2e44dd4 /src/core/hle/kernel/thread.cpp | |
| parent | core: Consolidate core and system state, remove system module & cleanups. (diff) | |
| download | yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.gz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.xz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.zip | |
core: Remove HLE module, consolidate code & various cleanups.
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 91c05fc42..c964b35d4 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include "core/arm/skyeye_common/armstate.h" | 14 | #include "core/arm/skyeye_common/armstate.h" |
| 15 | #include "core/core.h" | 15 | #include "core/core.h" |
| 16 | #include "core/core_timing.h" | 16 | #include "core/core_timing.h" |
| 17 | #include "core/hle/hle.h" | ||
| 18 | #include "core/hle/kernel/kernel.h" | 17 | #include "core/hle/kernel/kernel.h" |
| 19 | #include "core/hle/kernel/memory.h" | 18 | #include "core/hle/kernel/memory.h" |
| 20 | #include "core/hle/kernel/mutex.h" | 19 | #include "core/hle/kernel/mutex.h" |
| @@ -330,7 +329,7 @@ void Thread::ResumeFromWait() { | |||
| 330 | 329 | ||
| 331 | ready_queue.push_back(current_priority, this); | 330 | ready_queue.push_back(current_priority, this); |
| 332 | status = THREADSTATUS_READY; | 331 | status = THREADSTATUS_READY; |
| 333 | HLE::Reschedule(__func__); | 332 | Core::System::GetInstance().PrepareReschedule(); |
| 334 | } | 333 | } |
| 335 | 334 | ||
| 336 | /** | 335 | /** |
| @@ -545,8 +544,6 @@ void Reschedule() { | |||
| 545 | Thread* cur = GetCurrentThread(); | 544 | Thread* cur = GetCurrentThread(); |
| 546 | Thread* next = PopNextReadyThread(); | 545 | Thread* next = PopNextReadyThread(); |
| 547 | 546 | ||
| 548 | HLE::DoneRescheduling(); | ||
| 549 | |||
| 550 | if (cur && next) { | 547 | if (cur && next) { |
| 551 | LOG_TRACE(Kernel, "context switch %u -> %u", cur->GetObjectId(), next->GetObjectId()); | 548 | LOG_TRACE(Kernel, "context switch %u -> %u", cur->GetObjectId(), next->GetObjectId()); |
| 552 | } else if (cur) { | 549 | } else if (cur) { |