mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 09:53:22 +02:00
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.
This commit is contained in:
parent
0d0d6ef31a
commit
40c1439c34
@ -17,8 +17,6 @@
|
|||||||
|
|
||||||
namespace Core {
|
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_app_core = nullptr; ///< ARM11 application core
|
||||||
ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core
|
ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core
|
||||||
|
|
||||||
@ -60,7 +58,6 @@ void Stop() {
|
|||||||
int Init() {
|
int Init() {
|
||||||
LOG_DEBUG(Core, "initialized OK");
|
LOG_DEBUG(Core, "initialized OK");
|
||||||
|
|
||||||
disasm = new ARM_Disasm();
|
|
||||||
g_sys_core = new ARM_Interpreter();
|
g_sys_core = new ARM_Interpreter();
|
||||||
|
|
||||||
switch (Settings::values.cpu_core) {
|
switch (Settings::values.cpu_core) {
|
||||||
@ -73,13 +70,10 @@ int Init() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
last_ticks = Core::g_app_core->GetTicks();
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Shutdown() {
|
void Shutdown() {
|
||||||
delete disasm;
|
|
||||||
delete g_app_core;
|
delete g_app_core;
|
||||||
delete g_sys_core;
|
delete g_sys_core;
|
||||||
|
|
||||||
|
@ -21,11 +21,11 @@ void UpdateState(State state) {
|
|||||||
|
|
||||||
void Init(EmuWindow* emu_window) {
|
void Init(EmuWindow* emu_window) {
|
||||||
Core::Init();
|
Core::Init();
|
||||||
|
CoreTiming::Init();
|
||||||
Memory::Init();
|
Memory::Init();
|
||||||
HW::Init();
|
HW::Init();
|
||||||
Kernel::Init();
|
Kernel::Init();
|
||||||
HLE::Init();
|
HLE::Init();
|
||||||
CoreTiming::Init();
|
|
||||||
VideoCore::Init(emu_window);
|
VideoCore::Init(emu_window);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,11 +38,11 @@ void RunLoopUntil(u64 global_cycles) {
|
|||||||
|
|
||||||
void Shutdown() {
|
void Shutdown() {
|
||||||
VideoCore::Shutdown();
|
VideoCore::Shutdown();
|
||||||
CoreTiming::Shutdown();
|
|
||||||
HLE::Shutdown();
|
HLE::Shutdown();
|
||||||
Kernel::Shutdown();
|
Kernel::Shutdown();
|
||||||
HW::Shutdown();
|
HW::Shutdown();
|
||||||
Memory::Shutdown();
|
Memory::Shutdown();
|
||||||
|
CoreTiming::Shutdown();
|
||||||
Core::Shutdown();
|
Core::Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user