diff options
| author | 2014-12-15 22:15:08 -0500 | |
|---|---|---|
| committer | 2014-12-15 22:15:08 -0500 | |
| commit | cd2a31eaf4a35568a18840eba7d3cdac59881d2f (patch) | |
| tree | 37a4d61adebae300e8ef172538c6a2d2eae80ff1 /src/core/hle/kernel/kernel.cpp | |
| parent | Update README.md (diff) | |
| parent | Work around libstdc++'s lack of support for std::hash on enums (diff) | |
| download | yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.gz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.xz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.zip | |
Merge pull request #283 from yuriks/archive-refactor
Archive refactor
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index b38be0a49..929422b36 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include "core/core.h" | 9 | #include "core/core.h" |
| 10 | #include "core/hle/kernel/kernel.h" | 10 | #include "core/hle/kernel/kernel.h" |
| 11 | #include "core/hle/kernel/thread.h" | 11 | #include "core/hle/kernel/thread.h" |
| 12 | #include "core/hle/kernel/archive.h" | ||
| 13 | 12 | ||
| 14 | namespace Kernel { | 13 | namespace Kernel { |
| 15 | 14 | ||
| @@ -89,13 +88,11 @@ Object* ObjectPool::CreateByIDType(int type) { | |||
| 89 | /// Initialize the kernel | 88 | /// Initialize the kernel |
| 90 | void Init() { | 89 | void Init() { |
| 91 | Kernel::ThreadingInit(); | 90 | Kernel::ThreadingInit(); |
| 92 | Kernel::ArchiveInit(); | ||
| 93 | } | 91 | } |
| 94 | 92 | ||
| 95 | /// Shutdown the kernel | 93 | /// Shutdown the kernel |
| 96 | void Shutdown() { | 94 | void Shutdown() { |
| 97 | Kernel::ThreadingShutdown(); | 95 | Kernel::ThreadingShutdown(); |
| 98 | Kernel::ArchiveShutdown(); | ||
| 99 | 96 | ||
| 100 | g_object_pool.Clear(); // Free all kernel objects | 97 | g_object_pool.Clear(); // Free all kernel objects |
| 101 | } | 98 | } |
| @@ -106,8 +103,6 @@ void Shutdown() { | |||
| 106 | * @return True on success, otherwise false | 103 | * @return True on success, otherwise false |
| 107 | */ | 104 | */ |
| 108 | bool LoadExec(u32 entry_point) { | 105 | bool LoadExec(u32 entry_point) { |
| 109 | Init(); | ||
| 110 | |||
| 111 | Core::g_app_core->SetPC(entry_point); | 106 | Core::g_app_core->SetPC(entry_point); |
| 112 | 107 | ||
| 113 | // 0x30 is the typical main thread priority I've seen used so far | 108 | // 0x30 is the typical main thread priority I've seen used so far |