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/elf.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/elf.cpp')
| -rw-r--r-- | src/core/loader/elf.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index ff1221574a..5712a2a113 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -387,7 +387,7 @@ FileType AppLoader_ELF::IdentifyType(const FileSys::VirtualFile& file) { return FileType::Error; } -ResultStatus AppLoader_ELF::Load(Kernel::SharedPtr<Kernel::Process>& process) { +ResultStatus AppLoader_ELF::Load(Kernel::Process& process) { if (is_loaded) return ResultStatus::ErrorAlreadyLoaded; @@ -395,13 +395,13 @@ ResultStatus AppLoader_ELF::Load(Kernel::SharedPtr<Kernel::Process>& process) { if (buffer.size() != file->GetSize()) return ResultStatus::ErrorIncorrectELFFileSize; - const VAddr base_address = process->vm_manager.GetCodeRegionBaseAddress(); + const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress(); ElfReader elf_reader(&buffer[0]); SharedPtr<CodeSet> codeset = elf_reader.LoadInto(base_address); codeset->name = file->GetName(); - process->LoadModule(codeset, codeset->entrypoint); - process->Run(codeset->entrypoint, 48, Memory::DEFAULT_STACK_SIZE); + process.LoadModule(codeset, codeset->entrypoint); + process.Run(codeset->entrypoint, 48, Memory::DEFAULT_STACK_SIZE); is_loaded = true; return ResultStatus::Success; |