diff options
author | bunnei <bunneidev@gmail.com> | 2014-11-19 15:39:20 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-11-19 15:39:20 +0100 |
commit | 112768f4365816d345b0dc9b93bfecc3d41a69b5 (patch) | |
tree | 6d49fe44d004cb998e0b4b4d26066ae91eef01aa /src/core/core.cpp | |
parent | Merge pull request #212 from archshift/idea (diff) | |
parent | Add static to some variables (diff) | |
download | yuzu-112768f4365816d345b0dc9b93bfecc3d41a69b5.tar yuzu-112768f4365816d345b0dc9b93bfecc3d41a69b5.tar.gz yuzu-112768f4365816d345b0dc9b93bfecc3d41a69b5.tar.bz2 yuzu-112768f4365816d345b0dc9b93bfecc3d41a69b5.tar.lz yuzu-112768f4365816d345b0dc9b93bfecc3d41a69b5.tar.xz yuzu-112768f4365816d345b0dc9b93bfecc3d41a69b5.tar.zst yuzu-112768f4365816d345b0dc9b93bfecc3d41a69b5.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/core.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 25c78d33c..865898b24 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -16,10 +16,10 @@ namespace Core { -u64 g_last_ticks = 0; ///< Last CPU ticks -ARM_Disasm* g_disasm = nullptr; ///< ARM disassembler -ARM_Interface* g_app_core = nullptr; ///< ARM11 application core -ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core +static u64 last_ticks = 0; ///< Last CPU ticks +static ARM_Disasm* disasm = nullptr; ///< ARM disassembler +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(int tight_loop) { @@ -49,7 +49,7 @@ void Stop() { int Init() { NOTICE_LOG(MASTER_LOG, "initialized OK"); - g_disasm = new ARM_Disasm(); + disasm = new ARM_Disasm(); g_sys_core = new ARM_Interpreter(); switch (Settings::values.cpu_core) { @@ -62,13 +62,13 @@ int Init() { break; } - g_last_ticks = Core::g_app_core->GetTicks(); + last_ticks = Core::g_app_core->GetTicks(); return 0; } void Shutdown() { - delete g_disasm; + delete disasm; delete g_app_core; delete g_sys_core; |