nro: Make LoadNro take a VfsFile by const reference
This function doesn't need to care about ownership semantics, so we can just pass it a reference to the file itself, rather than a std::shared_ptr alias.
This commit is contained in:
parent
2f8ca32020
commit
0732786ddc
|
@ -127,10 +127,10 @@ static constexpr u32 PageAlignSize(u32 size) {
|
||||||
return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
|
return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) {
|
bool AppLoader_NRO::LoadNro(const FileSys::VfsFile& file, VAddr load_base) {
|
||||||
// Read NSO header
|
// Read NSO header
|
||||||
NroHeader nro_header{};
|
NroHeader nro_header{};
|
||||||
if (sizeof(NroHeader) != file->ReadObject(&nro_header)) {
|
if (sizeof(NroHeader) != file.ReadObject(&nro_header)) {
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
if (nro_header.magic != Common::MakeMagic('N', 'R', 'O', '0')) {
|
if (nro_header.magic != Common::MakeMagic('N', 'R', 'O', '0')) {
|
||||||
|
@ -138,7 +138,7 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build program image
|
// Build program image
|
||||||
std::vector<u8> program_image = file->ReadBytes(PageAlignSize(nro_header.file_size));
|
std::vector<u8> program_image = file.ReadBytes(PageAlignSize(nro_header.file_size));
|
||||||
if (program_image.size() != PageAlignSize(nro_header.file_size)) {
|
if (program_image.size() != PageAlignSize(nro_header.file_size)) {
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
@ -182,7 +182,7 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) {
|
||||||
Core::CurrentProcess()->LoadModule(std::move(codeset), load_base);
|
Core::CurrentProcess()->LoadModule(std::move(codeset), load_base);
|
||||||
|
|
||||||
// Register module with GDBStub
|
// Register module with GDBStub
|
||||||
GDBStub::RegisterModule(file->GetName(), load_base, load_base);
|
GDBStub::RegisterModule(file.GetName(), load_base, load_base);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -195,7 +195,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::Process& process) {
|
||||||
// Load NRO
|
// Load NRO
|
||||||
const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress();
|
const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress();
|
||||||
|
|
||||||
if (!LoadNro(file, base_address)) {
|
if (!LoadNro(*file, base_address)) {
|
||||||
return ResultStatus::ErrorLoadingNRO;
|
return ResultStatus::ErrorLoadingNRO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ public:
|
||||||
bool IsRomFSUpdatable() const override;
|
bool IsRomFSUpdatable() const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool LoadNro(FileSys::VirtualFile file, VAddr load_base);
|
bool LoadNro(const FileSys::VfsFile& file, VAddr load_base);
|
||||||
|
|
||||||
std::vector<u8> icon_data;
|
std::vector<u8> icon_data;
|
||||||
std::unique_ptr<FileSys::NACP> nacp;
|
std::unique_ptr<FileSys::NACP> nacp;
|
||||||
|
|
Loading…
Reference in a new issue