Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loader: Move NSO module tracking to AppLoader

Browse source 
Also cleanup of general stuff
This commit is contained in:
Zach Hilman 2019-05-26 11:40:41 -04:00
parent cdf52b9374
commit b77fde7c5c
22 changed files with 147 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/loader/nso.cpp
View file

@ -164,9 +164,6 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process,
// Register module with GDBStub
GDBStub::RegisterModule(file.GetName(), load_base, load_base);
// Register module for ARMInterface with System
Core::System::GetInstance().RegisterNSOModule(file.GetName(), load_base);
return load_base + image_size;
}
@ -175,11 +172,15 @@ AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::Process& process) {
return {ResultStatus::ErrorAlreadyLoaded, {}};
}
modules.clear();
// Load module
const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress();
if (!LoadModule(process, *file, base_address, true)) {
return {ResultStatus::ErrorLoadingNSO, {}};
}
modules.insert_or_assign(base_address, file->GetName());
LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), base_address);
is_loaded = true;
@ -187,4 +188,9 @@ AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::Process& process) {
LoadParameters{Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE}};
}
ResultStatus AppLoader_NSO::ReadNSOModules(Modules& modules) {
modules = this->modules;
return ResultStatus::Success;
}
} // namespace Loader