diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-29 22:57:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-29 22:57:02 +0200 |
commit | 334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8 (patch) | |
tree | 5ebf817e2c5ce6736d89e938769be3f73fbb30f4 /src/core/loader/deconstructed_rom_directory.cpp | |
parent | Merge pull request #1388 from FearlessTobi/port-4258 (diff) | |
parent | loader: Make the Load() function take a process as a regular reference, not a SharedPtr (diff) | |
download | yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar.gz yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar.bz2 yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar.lz yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar.xz yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar.zst yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 7e8035d0f..1b198cc5c 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -86,8 +86,7 @@ FileType AppLoader_DeconstructedRomDirectory::IdentifyType(const FileSys::Virtua return FileType::Error; } -ResultStatus AppLoader_DeconstructedRomDirectory::Load( - Kernel::SharedPtr<Kernel::Process>& process) { +ResultStatus AppLoader_DeconstructedRomDirectory::Load(Kernel::Process& process) { if (is_loaded) { return ResultStatus::ErrorAlreadyLoaded; } @@ -130,10 +129,10 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( return ResultStatus::Error32BitISA; } - process->LoadFromMetadata(metadata); + process.LoadFromMetadata(metadata); // Load NSO modules - const VAddr base_address = process->vm_manager.GetCodeRegionBaseAddress(); + const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress(); VAddr next_load_addr = base_address; for (const auto& module : {"rtld", "main", "subsdk0", "subsdk1", "subsdk2", "subsdk3", "subsdk4", "subsdk5", "subsdk6", "subsdk7", "sdk"}) { @@ -147,7 +146,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( } } - process->Run(base_address, metadata.GetMainThreadPriority(), metadata.GetMainThreadStackSize()); + process.Run(base_address, metadata.GetMainThreadPriority(), metadata.GetMainThreadStackSize()); // Find the RomFS by searching for a ".romfs" file in this directory const auto& files = dir->GetFiles(); |