summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-08-30 05:24:32 +0200
committerbunnei <bunneidev@gmail.com>2014-08-31 05:23:38 +0200
commiteb36d3fc903db8848f7493009c7b59c8ce038de9 (patch)
treef19f2b2bef6d36e65257e5edd1da1358c4edea6c
parentLoader: Added support for loading raw BIN executables. (diff)
downloadyuzu-eb36d3fc903db8848f7493009c7b59c8ce038de9.tar
yuzu-eb36d3fc903db8848f7493009c7b59c8ce038de9.tar.gz
yuzu-eb36d3fc903db8848f7493009c7b59c8ce038de9.tar.bz2
yuzu-eb36d3fc903db8848f7493009c7b59c8ce038de9.tar.lz
yuzu-eb36d3fc903db8848f7493009c7b59c8ce038de9.tar.xz
yuzu-eb36d3fc903db8848f7493009c7b59c8ce038de9.tar.zst
yuzu-eb36d3fc903db8848f7493009c7b59c8ce038de9.zip
-rw-r--r--src/citra/citra.cpp4
-rw-r--r--src/core/core.cpp26
-rw-r--r--src/core/core.h11
3 files changed, 20 insertions, 21 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 9399ff296..7dc721dc3 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -31,7 +31,9 @@ int __cdecl main(int argc, char **argv) {
return -1;
}
- Core::RunLoop();
+ while(true) {
+ Core::RunLoop();
+ }
delete emu_window;
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 @@
#include "common/log.h"
#include "common/symbols.h"
+#include "video_core/video_core.h"
+
#include "core/core.h"
#include "core/mem_map.h"
#include "core/hw/hw.h"
@@ -24,29 +26,17 @@ 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() {
- for (;;){
- // This function loops for 100 instructions in the CPU before trying to update hardware.
- // This is a little bit faster than SingleStep, and should be pretty much equivalent. The
- // number of instructions chosen is fairly arbitrary, however a large number will more
- // drastically affect the frequency of GSP interrupts and likely break things. The point of
- // this is to just loop in the CPU for more than 1 instruction to reduce overhead and make
- // it a little bit faster...
- g_app_core->Run(100);
- HW::Update();
- if (HLE::g_reschedule) {
- Kernel::Reschedule();
- }
+void RunLoop(int tight_loop) {
+ g_app_core->Run(tight_loop);
+ HW::Update();
+ if (HLE::g_reschedule) {
+ Kernel::Reschedule();
}
}
/// Step the CPU one instruction
void SingleStep() {
- g_app_core->Step();
- HW::Update();
- if (HLE::g_reschedule) {
- Kernel::Reschedule();
- }
+ RunLoop(1);
}
/// Halt the core
diff --git a/src/core/core.h b/src/core/core.h
index 4b42dabcb..9c72c8b3f 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -19,8 +19,15 @@ extern ARM_Interface* g_sys_core; ///< ARM11 system (OS) core
/// Start the core
void Start();
-/// Run the core CPU loop
-void RunLoop();
+/**
+ * Run the core CPU loop
+ * This function loops for 100 instructions in the CPU before trying to update hardware. This is a
+ * little bit faster than SingleStep, and should be pretty much equivalent. The number of
+ * instructions chosen is fairly arbitrary, however a large number will more drastically affect the
+ * frequency of GSP interrupts and likely break things. The point of this is to just loop in the CPU
+ * for more than 1 instruction to reduce overhead and make it a little bit faster...
+ */
+void RunLoop(int tight_loop=100);
/// Step the CPU one instruction
void SingleStep();