summaryrefslogtreecommitdiff
path: root/src/core/loader/nso.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-09-29 16:57:02 -0400
committerGravatar GitHub2018-09-29 16:57:02 -0400
commit334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8 (patch)
tree5ebf817e2c5ce6736d89e938769be3f73fbb30f4 /src/core/loader/nso.cpp
parentMerge pull request #1388 from FearlessTobi/port-4258 (diff)
parentloader: Make the Load() function take a process as a regular reference, not a... (diff)
downloadyuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar.gz
yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.tar.xz
yuzu-334090fe6f9fb7554e9b247bc3e4c6d4ece7dea8.zip
Merge pull request #1414 from lioncash/ref
loader: Make the Load() function take a process as a regular reference, not a SharedPtr
Diffstat (limited to 'src/core/loader/nso.cpp')
-rw-r--r--src/core/loader/nso.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp
index 1a6876a22..6fe3e17a7 100644
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -153,17 +153,17 @@ VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base) {
153 return load_base + image_size; 153 return load_base + image_size;
154} 154}
155 155
156ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) { 156ResultStatus AppLoader_NSO::Load(Kernel::Process& process) {
157 if (is_loaded) { 157 if (is_loaded) {
158 return ResultStatus::ErrorAlreadyLoaded; 158 return ResultStatus::ErrorAlreadyLoaded;
159 } 159 }
160 160
161 // Load module 161 // Load module
162 const VAddr base_address = process->vm_manager.GetCodeRegionBaseAddress(); 162 const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress();
163 LoadModule(file, base_address); 163 LoadModule(file, base_address);
164 LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), base_address); 164 LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), base_address);
165 165
166 process->Run(base_address, Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); 166 process.Run(base_address, Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE);
167 167
168 is_loaded = true; 168 is_loaded = true;
169 return ResultStatus::Success; 169 return ResultStatus::Success;