summaryrefslogtreecommitdiffstats
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-04-11 04:45:40 +0200
committerbunnei <ericbunnie@gmail.com>2014-04-11 04:45:40 +0200
commit5d95bb98434b8e7cd67010f6064ccdb69c1222bb (patch)
tree5d4c4f1b10d37e2619322a7f837883d61b1d2865 /src/core/system.cpp
parentadded logger for generic HLE (diff)
downloadyuzu-5d95bb98434b8e7cd67010f6064ccdb69c1222bb.tar
yuzu-5d95bb98434b8e7cd67010f6064ccdb69c1222bb.tar.gz
yuzu-5d95bb98434b8e7cd67010f6064ccdb69c1222bb.tar.bz2
yuzu-5d95bb98434b8e7cd67010f6064ccdb69c1222bb.tar.lz
yuzu-5d95bb98434b8e7cd67010f6064ccdb69c1222bb.tar.xz
yuzu-5d95bb98434b8e7cd67010f6064ccdb69c1222bb.tar.zst
yuzu-5d95bb98434b8e7cd67010f6064ccdb69c1222bb.zip
Diffstat (limited to '')
-rw-r--r--src/core/system.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp
index edb07fef5..c77092327 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -7,6 +7,7 @@
#include "core/mem_map.h"
#include "core/system.h"
#include "core/hw/hw.h"
+#include "core/hle/hle.h"
#include "video_core/video_core.h"
@@ -19,15 +20,16 @@ void UpdateState(State state) {
}
void Init(EmuWindow* emu_window) {
- Core::Init();
- Memory::Init();
+ Core::Init();
+ Memory::Init();
HW::Init();
- CoreTiming::Init();
+ HLE::Init();
+ CoreTiming::Init();
VideoCore::Init(emu_window);
}
void RunLoopFor(int cycles) {
- RunLoopUntil(CoreTiming::GetTicks() + cycles);
+ RunLoopUntil(CoreTiming::GetTicks() + cycles);
}
void RunLoopUntil(u64 global_cycles) {
@@ -35,9 +37,12 @@ void RunLoopUntil(u64 global_cycles) {
void Shutdown() {
Core::Shutdown();
+ Memory::Shutdown();
HW::Shutdown();
+ HLE::Shutdown();
+ CoreTiming::Shutdown();
VideoCore::Shutdown();
- g_ctr_file_system.Shutdown();
+ g_ctr_file_system.Shutdown();
}
} // namespace