1 files changed, 12 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 8ac4481cc..ff506d67d 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -5,6 +5,7 @@
 #include "common/common_types.h"
 
 #include "core/core.h"
+#include "core/core_timing.h"
 
 #include "core/settings.h"
 #include "core/arm/disassembler/arm_disasm.h"
@@ -16,14 +17,22 @@
 
 namespace Core {
 
-static u64         last_ticks = 0;        ///< Last CPU ticks
-static ARM_Disasm* disasm     = nullptr;  ///< ARM disassembler
 ARM_Interface*     g_app_core = nullptr;  ///< ARM11 application core
 ARM_Interface*     g_sys_core = nullptr;  ///< ARM11 system (OS) core
 
 /// Run the core CPU loop
 void RunLoop(int tight_loop) {
-    g_app_core->Run(tight_loop);
+    // If the current thread is an idle thread, then don't execute instructions,
+    // instead advance to the next event and try to yield to the next thread
+    if (Kernel::IsIdleThread(Kernel::GetCurrentThreadHandle())) {
+        LOG_TRACE(Core_ARM11, "Idling");
+        CoreTiming::Idle();
+        CoreTiming::Advance();
+        HLE::Reschedule(__func__);
+    } else {
+        g_app_core->Run(tight_loop);
+    }
+
     HW::Update();
     if (HLE::g_reschedule) {
         Kernel::Reschedule();
@@ -49,7 +58,6 @@ void Stop() {
 int Init() {
     LOG_DEBUG(Core, "initialized OK");
 
-    disasm = new ARM_Disasm();
     g_sys_core = new ARM_Interpreter();
 
     switch (Settings::values.cpu_core) {
@@ -62,13 +70,10 @@ int Init() {
             break;
     }
 
-    last_ticks = Core::g_app_core->GetTicks();
-
     return 0;
 }
 
 void Shutdown() {
-    delete disasm;
     delete g_app_core;
     delete g_sys_core;