summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 7106151bd..ff0721079 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -18,11 +18,6 @@
18#include "core/file_sys/registered_cache.h" 18#include "core/file_sys/registered_cache.h"
19#include "core/file_sys/vfs_concat.h" 19#include "core/file_sys/vfs_concat.h"
20#include "core/file_sys/vfs_real.h" 20#include "core/file_sys/vfs_real.h"
21#include "core/frontend/applets/error.h"
22#include "core/frontend/applets/general_frontend.h"
23#include "core/frontend/applets/profile_select.h"
24#include "core/frontend/applets/software_keyboard.h"
25#include "core/frontend/applets/web_browser.h"
26#include "core/gdbstub/gdbstub.h" 21#include "core/gdbstub/gdbstub.h"
27#include "core/hle/kernel/client_port.h" 22#include "core/hle/kernel/client_port.h"
28#include "core/hle/kernel/kernel.h" 23#include "core/hle/kernel/kernel.h"
@@ -37,9 +32,6 @@
37#include "core/settings.h" 32#include "core/settings.h"
38#include "core/telemetry_session.h" 33#include "core/telemetry_session.h"
39#include "file_sys/cheat_engine.h" 34#include "file_sys/cheat_engine.h"
40#include "frontend/applets/profile_select.h"
41#include "frontend/applets/software_keyboard.h"
42#include "frontend/applets/web_browser.h"
43#include "video_core/debug_utils/debug_utils.h" 35#include "video_core/debug_utils/debug_utils.h"
44#include "video_core/renderer_base.h" 36#include "video_core/renderer_base.h"
45#include "video_core/video_core.h" 37#include "video_core/video_core.h"
@@ -144,20 +136,10 @@ struct System::Impl {
144 ResultStatus Load(System& system, Frontend::EmuWindow& emu_window, 136 ResultStatus Load(System& system, Frontend::EmuWindow& emu_window,
145 const std::string& filepath) { 137 const std::string& filepath) {
146 app_loader = Loader::GetLoader(GetGameFileFromPath(virtual_filesystem, filepath)); 138 app_loader = Loader::GetLoader(GetGameFileFromPath(virtual_filesystem, filepath));
147
148 if (!app_loader) { 139 if (!app_loader) {
149 LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); 140 LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
150 return ResultStatus::ErrorGetLoader; 141 return ResultStatus::ErrorGetLoader;
151 } 142 }
152 std::pair<std::optional<u32>, Loader::ResultStatus> system_mode =
153 app_loader->LoadKernelSystemMode();
154
155 if (system_mode.second != Loader::ResultStatus::Success) {
156 LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!",
157 static_cast<int>(system_mode.second));
158
159 return ResultStatus::ErrorSystemMode;
160 }
161 143
162 ResultStatus init_result{Init(system, emu_window)}; 144 ResultStatus init_result{Init(system, emu_window)};
163 if (init_result != ResultStatus::Success) { 145 if (init_result != ResultStatus::Success) {
@@ -167,6 +149,7 @@ struct System::Impl {
167 return init_result; 149 return init_result;
168 } 150 }
169 151
152 telemetry_session->AddInitialInfo(*app_loader);
170 auto main_process = Kernel::Process::Create(system, "main"); 153 auto main_process = Kernel::Process::Create(system, "main");
171 const auto [load_result, load_parameters] = app_loader->Load(*main_process); 154 const auto [load_result, load_parameters] = app_loader->Load(*main_process);
172 if (load_result != Loader::ResultStatus::Success) { 155 if (load_result != Loader::ResultStatus::Success) {