diff options
| author | 2015-01-08 21:48:18 -0500 | |
|---|---|---|
| committer | 2015-01-08 21:49:41 -0500 | |
| commit | 40c1439c34105300594abb4fad7ff3d1758bb221 (patch) | |
| tree | 2eb72bb96e65660201520327c138485917f63c07 /src/core/core.cpp | |
| parent | Merge pull request #450 from Subv/ticks_fix (diff) | |
| download | yuzu-40c1439c34105300594abb4fad7ff3d1758bb221.tar.gz yuzu-40c1439c34105300594abb4fad7ff3d1758bb221.tar.xz yuzu-40c1439c34105300594abb4fad7ff3d1758bb221.zip | |
Core: Fixed a crash and removed some unused variables.
ARM_Disasm only has static methods, so there's no need to have an instance of it.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 6 |
1 files changed, 0 insertions, 6 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 @@ | |||
| 17 | 17 | ||
| 18 | namespace Core { | 18 | namespace Core { |
| 19 | 19 | ||
| 20 | static u64 last_ticks = 0; ///< Last CPU ticks | ||
| 21 | static ARM_Disasm* disasm = nullptr; ///< ARM disassembler | ||
| 22 | ARM_Interface* g_app_core = nullptr; ///< ARM11 application core | 20 | ARM_Interface* g_app_core = nullptr; ///< ARM11 application core |
| 23 | ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core | 21 | ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core |
| 24 | 22 | ||
| @@ -60,7 +58,6 @@ void Stop() { | |||
| 60 | int Init() { | 58 | int Init() { |
| 61 | LOG_DEBUG(Core, "initialized OK"); | 59 | LOG_DEBUG(Core, "initialized OK"); |
| 62 | 60 | ||
| 63 | disasm = new ARM_Disasm(); | ||
| 64 | g_sys_core = new ARM_Interpreter(); | 61 | g_sys_core = new ARM_Interpreter(); |
| 65 | 62 | ||
| 66 | switch (Settings::values.cpu_core) { | 63 | switch (Settings::values.cpu_core) { |
| @@ -73,13 +70,10 @@ int Init() { | |||
| 73 | break; | 70 | break; |
| 74 | } | 71 | } |
| 75 | 72 | ||
| 76 | last_ticks = Core::g_app_core->GetTicks(); | ||
| 77 | |||
| 78 | return 0; | 73 | return 0; |
| 79 | } | 74 | } |
| 80 | 75 | ||
| 81 | void Shutdown() { | 76 | void Shutdown() { |
| 82 | delete disasm; | ||
| 83 | delete g_app_core; | 77 | delete g_app_core; |
| 84 | delete g_sys_core; | 78 | delete g_sys_core; |
| 85 | 79 | ||