diff options
| author | 2014-05-26 20:52:00 -0400 | |
|---|---|---|
| committer | 2014-05-26 20:52:00 -0400 | |
| commit | 6448c2f30062c085330ff26a4812c9a91c7b492c (patch) | |
| tree | 386e32cf3ec053491fb8dfd8459a1c92553241d9 /src/core/core.cpp | |
| parent | Merge pull request #4 from archshift/patch-1 (diff) | |
| parent | service: fixed typo that MSVC did not catch as an error (diff) | |
| download | yuzu-6448c2f30062c085330ff26a4812c9a91c7b492c.tar.gz yuzu-6448c2f30062c085330ff26a4812c9a91c7b492c.tar.xz yuzu-6448c2f30062c085330ff26a4812c9a91c7b492c.zip | |
Merge pull request #9 from bunnei/master
Add initial kernel HLE, includes thread creation and context switching
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 61c237b2c..f88bcd704 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -12,6 +12,8 @@ | |||
| 12 | #include "core/arm/disassembler/arm_disasm.h" | 12 | #include "core/arm/disassembler/arm_disasm.h" |
| 13 | #include "core/arm/interpreter/arm_interpreter.h" | 13 | #include "core/arm/interpreter/arm_interpreter.h" |
| 14 | 14 | ||
| 15 | #include "core/hle/kernel/thread.h" | ||
| 16 | |||
| 15 | namespace Core { | 17 | namespace Core { |
| 16 | 18 | ||
| 17 | ARM_Disasm* g_disasm = NULL; ///< ARM disassembler | 19 | ARM_Disasm* g_disasm = NULL; ///< ARM disassembler |
| @@ -21,14 +23,17 @@ ARM_Interface* g_sys_core = NULL; ///< ARM11 system (OS) core | |||
| 21 | /// Run the core CPU loop | 23 | /// Run the core CPU loop |
| 22 | void RunLoop() { | 24 | void RunLoop() { |
| 23 | for (;;){ | 25 | for (;;){ |
| 24 | g_app_core->Run(10000); | 26 | g_app_core->Run(100); |
| 25 | HW::Update(); | 27 | HW::Update(); |
| 28 | Kernel::Reschedule(); | ||
| 26 | } | 29 | } |
| 27 | } | 30 | } |
| 28 | 31 | ||
| 29 | /// Step the CPU one instruction | 32 | /// Step the CPU one instruction |
| 30 | void SingleStep() { | 33 | void SingleStep() { |
| 31 | g_app_core->Step(); | 34 | g_app_core->Step(); |
| 35 | HW::Update(); | ||
| 36 | Kernel::Reschedule(); | ||
| 32 | } | 37 | } |
| 33 | 38 | ||
| 34 | /// Halt the core | 39 | /// Halt the core |