diff options
| author | 2015-01-09 12:59:35 -0500 | |
|---|---|---|
| committer | 2015-01-09 12:59:35 -0500 | |
| commit | 6ae12424df58f0ea171fc75ca4b700ab1fffc192 (patch) | |
| tree | 93d87f3cb19d08541c6b8f8a9e0ceb730a2b13d9 /src/core/core.cpp | |
| parent | Merge pull request #436 from kevinhartman/system-core (diff) | |
| parent | Thread: Fix nullptr access in a logging function (diff) | |
| download | yuzu-6ae12424df58f0ea171fc75ca4b700ab1fffc192.tar.gz yuzu-6ae12424df58f0ea171fc75ca4b700ab1fffc192.tar.xz yuzu-6ae12424df58f0ea171fc75ca4b700ab1fffc192.zip | |
Merge pull request #444 from yuriks/handle-reform2
Kernel Lifetime Reform Pt. 2
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index ff506d67d..e9e5c35cc 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include "core/core_timing.h" | 8 | #include "core/core_timing.h" |
| 9 | 9 | ||
| 10 | #include "core/settings.h" | 10 | #include "core/settings.h" |
| 11 | #include "core/arm/arm_interface.h" | ||
| 11 | #include "core/arm/disassembler/arm_disasm.h" | 12 | #include "core/arm/disassembler/arm_disasm.h" |
| 12 | #include "core/arm/interpreter/arm_interpreter.h" | 13 | #include "core/arm/interpreter/arm_interpreter.h" |
| 13 | #include "core/arm/dyncom/arm_dyncom.h" | 14 | #include "core/arm/dyncom/arm_dyncom.h" |
| @@ -24,7 +25,7 @@ ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core | |||
| 24 | void RunLoop(int tight_loop) { | 25 | void RunLoop(int tight_loop) { |
| 25 | // If the current thread is an idle thread, then don't execute instructions, | 26 | // If the current thread is an idle thread, then don't execute instructions, |
| 26 | // instead advance to the next event and try to yield to the next thread | 27 | // instead advance to the next event and try to yield to the next thread |
| 27 | if (Kernel::IsIdleThread(Kernel::GetCurrentThreadHandle())) { | 28 | if (Kernel::GetCurrentThread()->IsIdle()) { |
| 28 | LOG_TRACE(Core_ARM11, "Idling"); | 29 | LOG_TRACE(Core_ARM11, "Idling"); |
| 29 | CoreTiming::Idle(); | 30 | CoreTiming::Idle(); |
| 30 | CoreTiming::Advance(); | 31 | CoreTiming::Advance(); |