summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-09 04:20:42 +0100
committerbunnei <bunneidev@gmail.com>2015-01-09 04:20:42 +0100
commit97cfdd16e637edceb08c81f446964bb9f52330b9 (patch)
tree2eb72bb96e65660201520327c138485917f63c07
parentMerge pull request #450 from Subv/ticks_fix (diff)
parentCore: Fixed a crash and removed some unused variables. (diff)
downloadyuzu-97cfdd16e637edceb08c81f446964bb9f52330b9.tar
yuzu-97cfdd16e637edceb08c81f446964bb9f52330b9.tar.gz
yuzu-97cfdd16e637edceb08c81f446964bb9f52330b9.tar.bz2
yuzu-97cfdd16e637edceb08c81f446964bb9f52330b9.tar.lz
yuzu-97cfdd16e637edceb08c81f446964bb9f52330b9.tar.xz
yuzu-97cfdd16e637edceb08c81f446964bb9f52330b9.tar.zst
yuzu-97cfdd16e637edceb08c81f446964bb9f52330b9.zip
-rw-r--r--src/core/core.cpp6
-rw-r--r--src/core/system.cpp4
2 files changed, 2 insertions, 8 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 98f8a7dff..ff506d67d 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -17,8 +17,6 @@
namespace 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
@@ -60,7 +58,6 @@ void Stop() {
int Init() {
LOG_DEBUG(Core, "initialized OK");
- disasm = new ARM_Disasm();
g_sys_core = new ARM_Interpreter();
switch (Settings::values.cpu_core) {
@@ -73,13 +70,10 @@ int Init() {
break;
}
- last_ticks = Core::g_app_core->GetTicks();
-
return 0;
}
void Shutdown() {
- delete disasm;
delete g_app_core;
delete g_sys_core;
diff --git a/src/core/system.cpp b/src/core/system.cpp
index d6188f055..f4c2df1cd 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -21,11 +21,11 @@ void UpdateState(State state) {
void Init(EmuWindow* emu_window) {
Core::Init();
+ CoreTiming::Init();
Memory::Init();
HW::Init();
Kernel::Init();
HLE::Init();
- CoreTiming::Init();
VideoCore::Init(emu_window);
}
@@ -38,11 +38,11 @@ void RunLoopUntil(u64 global_cycles) {
void Shutdown() {
VideoCore::Shutdown();
- CoreTiming::Shutdown();
HLE::Shutdown();
Kernel::Shutdown();
HW::Shutdown();
Memory::Shutdown();
+ CoreTiming::Shutdown();
Core::Shutdown();
}