diff options
author | bunnei <ericbunnie@gmail.com> | 2014-05-17 13:35:20 -0400 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-05-17 13:35:20 -0400 |
commit | 3fac6dc39e6e94aa068d93535261eede97224e50 (patch) | |
tree | 41b5a266814d633b94d090f13bc46c89e8f7f622 /src/core/core.cpp | |
parent | 14ae026386cf3f984d60401e2104165c3ca3266b (diff) | |
parent | 265c770a9d663b96a9a422201bac3dd454fa95c0 (diff) |
Merge branch 'master' into threading
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r-- | src/core/core.cpp | 9 |
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 @@ #include "common/common_types.h" #include "common/log.h" -#include "core/core.h" +#include "common/symbols.h" +#include "core/core.h" #include "core/mem_map.h" #include "core/hw/hw.h" #include "core/arm/disassembler/arm_disasm.h" @@ -19,13 +20,15 @@ ARM_Interface* g_sys_core = NULL; ///< ARM11 system (OS) core /// Run the core CPU loop void RunLoop() { - // TODO(ShizZy): ImplementMe + for (;;){ + g_app_core->Run(10000); + HW::Update(); + } } /// Step the CPU one instruction void SingleStep() { g_app_core->Step(); - HW::Update(); } /// Halt the core |