diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-09-29 15:57:40 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-09-29 16:00:03 -0400 |
| commit | a63e6f9dfd75f89841817a0185d606da52c7a4a6 (patch) | |
| tree | 5ebf817e2c5ce6736d89e938769be3f73fbb30f4 /src/core/loader/nro.cpp | |
| parent | 0921558a9fb1a4bfe0ffd64a2e8be27693017b20 (diff) | |
loader: Make the Load() function take a process as a regular reference, not a SharedPtr
A process should never require being reference counted in this
situation. If the handle to a process is freed before this function is
called, it's definitely a bug with our lifetime management, so we can
put the requirement in place for the API that the process must be a
valid instance.
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index b72871efa3..8ad973c3a0 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -175,19 +175,19 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) { return true; } -ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) { +ResultStatus AppLoader_NRO::Load(Kernel::Process& process) { if (is_loaded) { return ResultStatus::ErrorAlreadyLoaded; } // Load NRO - const VAddr base_address = process->vm_manager.GetCodeRegionBaseAddress(); + const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress(); if (!LoadNro(file, base_address)) { return ResultStatus::ErrorLoadingNRO; } - process->Run(base_address, Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); + process.Run(base_address, Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); is_loaded = true; return ResultStatus::Success; |