summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-05-17 13:35:20 -0400
committerGravatar bunnei2014-05-17 13:35:20 -0400
commit3fac6dc39e6e94aa068d93535261eede97224e50 (patch)
tree41b5a266814d633b94d090f13bc46c89e8f7f622 /src/core/core.cpp
parent- added enum ThreadProcessorId (diff)
parentupdated how we call ARM core to make things much faster (diff)
downloadyuzu-3fac6dc39e6e94aa068d93535261eede97224e50.tar.gz
yuzu-3fac6dc39e6e94aa068d93535261eede97224e50.tar.xz
yuzu-3fac6dc39e6e94aa068d93535261eede97224e50.zip
Merge branch 'master' into threading
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 859a62c78..61c237b2c 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -4,8 +4,9 @@
4 4
5#include "common/common_types.h" 5#include "common/common_types.h"
6#include "common/log.h" 6#include "common/log.h"
7#include "core/core.h" 7#include "common/symbols.h"
8 8
9#include "core/core.h"
9#include "core/mem_map.h" 10#include "core/mem_map.h"
10#include "core/hw/hw.h" 11#include "core/hw/hw.h"
11#include "core/arm/disassembler/arm_disasm.h" 12#include "core/arm/disassembler/arm_disasm.h"
@@ -19,13 +20,15 @@ ARM_Interface* g_sys_core = NULL; ///< ARM11 system (OS) core
19 20
20/// Run the core CPU loop 21/// Run the core CPU loop
21void RunLoop() { 22void RunLoop() {
22 // TODO(ShizZy): ImplementMe 23 for (;;){
24 g_app_core->Run(10000);
25 HW::Update();
26 }
23} 27}
24 28
25/// Step the CPU one instruction 29/// Step the CPU one instruction
26void SingleStep() { 30void SingleStep() {
27 g_app_core->Step(); 31 g_app_core->Step();
28 HW::Update();
29} 32}
30 33
31/// Halt the core 34/// Halt the core