lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-29 15:33:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

loader: nro: Fix process initialization using ProgramMetadata default.

Browse source
This commit is contained in:
bunnei 2020-04-20 18:16:55 -04:00
parent 68039addbc
commit 9c12aef2f8
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/loader/nro.cpp
View file

@ -131,7 +131,7 @@ static constexpr u32 PageAlignSize(u32 size) {
} }
static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data, static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data,
const std::string& name, VAddr load_base) { const std::string& name) {
if (data.size() < sizeof(NroHeader)) { if (data.size() < sizeof(NroHeader)) {
return {}; return {};
} }
@ -187,19 +187,25 @@ static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data,
codeset.DataSegment().size += bss_size; codeset.DataSegment().size += bss_size;
program_image.resize(static_cast<u32>(program_image.size()) + bss_size); program_image.resize(static_cast<u32>(program_image.size()) + bss_size);
// Setup the process code layout
if (process.LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), program_image.size())
.IsError()) {
return false;
}
// Load codeset for current process // Load codeset for current process
codeset.memory = std::move(program_image); codeset.memory = std::move(program_image);
process.LoadModule(std::move(codeset), load_base); process.LoadModule(std::move(codeset), process.PageTable().GetCodeRegionStart());
// Register module with GDBStub // Register module with GDBStub
GDBStub::RegisterModule(name, load_base, load_base); GDBStub::RegisterModule(name, process.PageTable().GetCodeRegionStart(),
process.PageTable().GetCodeRegionEnd());
return true; return true;
} }
bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file) {
VAddr load_base) { return LoadNroImpl(process, file.ReadAllBytes(), file.GetName());
return LoadNroImpl(process, file.ReadAllBytes(), file.GetName(), load_base);
} }
AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) {
@ -207,10 +213,7 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) {
return {ResultStatus::ErrorAlreadyLoaded, {}}; return {ResultStatus::ErrorAlreadyLoaded, {}};
} }
// Load NRO if (!LoadNro(process, *file)) {
const VAddr base_address = process.PageTable().GetCodeRegionStart();
if (!LoadNro(process, *file, base_address)) {
return {ResultStatus::ErrorLoadingNRO, {}}; return {ResultStatus::ErrorLoadingNRO, {}};
} }

2
src/core/loader/nro.h
View file

@ -47,7 +47,7 @@ public:
bool IsRomFSUpdatable() const override; bool IsRomFSUpdatable() const override;
private: private:
bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base); bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file);
std::vector<u8> icon_data; std::vector<u8> icon_data;
std::unique_ptr<FileSys::NACP> nacp; std::unique_ptr<FileSys::NACP> nacp;