diff options
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index f6273ac39..caa6a77be 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -293,6 +293,7 @@ struct System::Impl { | |||
| 293 | ASSERT(Kernel::KProcess::Initialize(main_process, system, "main", | 293 | ASSERT(Kernel::KProcess::Initialize(main_process, system, "main", |
| 294 | Kernel::KProcess::ProcessType::Userland, resource_limit) | 294 | Kernel::KProcess::ProcessType::Userland, resource_limit) |
| 295 | .IsSuccess()); | 295 | .IsSuccess()); |
| 296 | kernel.MakeApplicationProcess(main_process); | ||
| 296 | const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); | 297 | const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); |
| 297 | if (load_result != Loader::ResultStatus::Success) { | 298 | if (load_result != Loader::ResultStatus::Success) { |
| 298 | LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", load_result); | 299 | LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", load_result); |
| @@ -302,7 +303,6 @@ struct System::Impl { | |||
| 302 | static_cast<u32>(SystemResultStatus::ErrorLoader) + static_cast<u32>(load_result)); | 303 | static_cast<u32>(SystemResultStatus::ErrorLoader) + static_cast<u32>(load_result)); |
| 303 | } | 304 | } |
| 304 | AddGlueRegistrationForProcess(*app_loader, *main_process); | 305 | AddGlueRegistrationForProcess(*app_loader, *main_process); |
| 305 | kernel.MakeApplicationProcess(main_process); | ||
| 306 | kernel.InitializeCores(); | 306 | kernel.InitializeCores(); |
| 307 | 307 | ||
| 308 | // Initialize cheat engine | 308 | // Initialize cheat engine |
| @@ -681,11 +681,11 @@ const ExclusiveMonitor& System::Monitor() const { | |||
| 681 | return impl->kernel.GetExclusiveMonitor(); | 681 | return impl->kernel.GetExclusiveMonitor(); |
| 682 | } | 682 | } |
| 683 | 683 | ||
| 684 | Memory::Memory& System::Memory() { | 684 | Memory::Memory& System::ApplicationMemory() { |
| 685 | return impl->memory; | 685 | return impl->memory; |
| 686 | } | 686 | } |
| 687 | 687 | ||
| 688 | const Core::Memory::Memory& System::Memory() const { | 688 | const Core::Memory::Memory& System::ApplicationMemory() const { |
| 689 | return impl->memory; | 689 | return impl->memory; |
| 690 | } | 690 | } |
| 691 | 691 | ||