diff options
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index fc9909377..f21801e52 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | #include "common/log.h" | 6 | #include "common/log.h" |
| 7 | #include "common/symbols.h" | 7 | #include "common/symbols.h" |
| 8 | 8 | ||
| 9 | #include "video_core/video_core.h" | ||
| 10 | |||
| 9 | #include "core/core.h" | 11 | #include "core/core.h" |
| 10 | #include "core/mem_map.h" | 12 | #include "core/mem_map.h" |
| 11 | #include "core/hw/hw.h" | 13 | #include "core/hw/hw.h" |
| @@ -24,29 +26,17 @@ ARM_Interface* g_app_core = nullptr; ///< ARM11 application core | |||
| 24 | ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core | 26 | ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core |
| 25 | 27 | ||
| 26 | /// Run the core CPU loop | 28 | /// Run the core CPU loop |
| 27 | void RunLoop() { | 29 | void RunLoop(int tight_loop) { |
| 28 | for (;;){ | 30 | g_app_core->Run(tight_loop); |
| 29 | // This function loops for 100 instructions in the CPU before trying to update hardware. | 31 | HW::Update(); |
| 30 | // This is a little bit faster than SingleStep, and should be pretty much equivalent. The | 32 | if (HLE::g_reschedule) { |
| 31 | // number of instructions chosen is fairly arbitrary, however a large number will more | 33 | Kernel::Reschedule(); |
| 32 | // drastically affect the frequency of GSP interrupts and likely break things. The point of | ||
| 33 | // this is to just loop in the CPU for more than 1 instruction to reduce overhead and make | ||
| 34 | // it a little bit faster... | ||
| 35 | g_app_core->Run(100); | ||
| 36 | HW::Update(); | ||
| 37 | if (HLE::g_reschedule) { | ||
| 38 | Kernel::Reschedule(); | ||
| 39 | } | ||
| 40 | } | 34 | } |
| 41 | } | 35 | } |
| 42 | 36 | ||
| 43 | /// Step the CPU one instruction | 37 | /// Step the CPU one instruction |
| 44 | void SingleStep() { | 38 | void SingleStep() { |
| 45 | g_app_core->Step(); | 39 | RunLoop(1); |
| 46 | HW::Update(); | ||
| 47 | if (HLE::g_reschedule) { | ||
| 48 | Kernel::Reschedule(); | ||
| 49 | } | ||
| 50 | } | 40 | } |
| 51 | 41 | ||
| 52 | /// Halt the core | 42 | /// Halt the core |