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.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 84ab876cc..8c2977522 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -87,14 +87,14 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
87 app_loader = Loader::GetLoader(filepath); 87 app_loader = Loader::GetLoader(filepath);
88 88
89 if (!app_loader) { 89 if (!app_loader) {
90 NGLOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); 90 LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
91 return ResultStatus::ErrorGetLoader; 91 return ResultStatus::ErrorGetLoader;
92 } 92 }
93 std::pair<boost::optional<u32>, Loader::ResultStatus> system_mode = 93 std::pair<boost::optional<u32>, Loader::ResultStatus> system_mode =
94 app_loader->LoadKernelSystemMode(); 94 app_loader->LoadKernelSystemMode();
95 95
96 if (system_mode.second != Loader::ResultStatus::Success) { 96 if (system_mode.second != Loader::ResultStatus::Success) {
97 NGLOG_CRITICAL(Core, "Failed to determine system mode (Error {})!", 97 LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!",
98 static_cast<int>(system_mode.second)); 98 static_cast<int>(system_mode.second));
99 99
100 switch (system_mode.second) { 100 switch (system_mode.second) {
@@ -111,7 +111,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
111 111
112 ResultStatus init_result{Init(emu_window, system_mode.first.get())}; 112 ResultStatus init_result{Init(emu_window, system_mode.first.get())};
113 if (init_result != ResultStatus::Success) { 113 if (init_result != ResultStatus::Success) {
114 NGLOG_CRITICAL(Core, "Failed to initialize system (Error {})!", 114 LOG_CRITICAL(Core, "Failed to initialize system (Error {})!",
115 static_cast<int>(init_result)); 115 static_cast<int>(init_result));
116 System::Shutdown(); 116 System::Shutdown();
117 return init_result; 117 return init_result;
@@ -119,7 +119,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
119 119
120 const Loader::ResultStatus load_result{app_loader->Load(current_process)}; 120 const Loader::ResultStatus load_result{app_loader->Load(current_process)};
121 if (Loader::ResultStatus::Success != load_result) { 121 if (Loader::ResultStatus::Success != load_result) {
122 NGLOG_CRITICAL(Core, "Failed to load ROM (Error {})!", static_cast<int>(load_result)); 122 LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", static_cast<int>(load_result));
123 System::Shutdown(); 123 System::Shutdown();
124 124
125 switch (load_result) { 125 switch (load_result) {
@@ -161,7 +161,7 @@ Cpu& System::CpuCore(size_t core_index) {
161} 161}
162 162
163System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { 163System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
164 NGLOG_DEBUG(HW_Memory, "initialized OK"); 164 LOG_DEBUG(HW_Memory, "initialized OK");
165 165
166 CoreTiming::Init(); 166 CoreTiming::Init();
167 167
@@ -196,7 +196,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
196 } 196 }
197 } 197 }
198 198
199 NGLOG_DEBUG(Core, "Initialized OK"); 199 LOG_DEBUG(Core, "Initialized OK");
200 200
201 // Reset counters and set time origin to current frame 201 // Reset counters and set time origin to current frame
202 GetAndResetPerfStats(); 202 GetAndResetPerfStats();
@@ -245,7 +245,7 @@ void System::Shutdown() {
245 // Close app loader 245 // Close app loader
246 app_loader.reset(); 246 app_loader.reset();
247 247
248 NGLOG_DEBUG(Core, "Shutdown OK"); 248 LOG_DEBUG(Core, "Shutdown OK");
249} 249}
250 250
251Service::SM::ServiceManager& System::ServiceManager() { 251Service::SM::ServiceManager& System::ServiceManager() {