summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-11-18 14:48:11 +0100
committerLioncash <mathew1800@gmail.com>2014-11-19 02:04:00 +0100
commit7cbecde2ca1b0ea3faf4caf384b6512cb9849162 (patch)
tree9ab722431792e984297aa71a10a0359e9aab80e4 /src/core/core.cpp
parentMerge pull request #200 from lioncash/statics (diff)
downloadyuzu-7cbecde2ca1b0ea3faf4caf384b6512cb9849162.tar
yuzu-7cbecde2ca1b0ea3faf4caf384b6512cb9849162.tar.gz
yuzu-7cbecde2ca1b0ea3faf4caf384b6512cb9849162.tar.bz2
yuzu-7cbecde2ca1b0ea3faf4caf384b6512cb9849162.tar.lz
yuzu-7cbecde2ca1b0ea3faf4caf384b6512cb9849162.tar.xz
yuzu-7cbecde2ca1b0ea3faf4caf384b6512cb9849162.tar.zst
yuzu-7cbecde2ca1b0ea3faf4caf384b6512cb9849162.zip
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp14
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;