summaryrefslogtreecommitdiffstats
path: root/src/core/loader/nro.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/loader/nro.cpp32
1 files changed, 10 insertions, 22 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index 3853cfa1a..08b7aad7a 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -47,14 +47,12 @@ struct ModHeader {
};
static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
-AppLoader_NRO::AppLoader_NRO(FileUtil::IOFile&& file, std::string filepath)
- : AppLoader(std::move(file)), filepath(std::move(filepath)) {}
+AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(file) {}
-FileType AppLoader_NRO::IdentifyType(FileUtil::IOFile& file, const std::string&) {
+FileType AppLoader_NRO::IdentifyType(const FileSys::VirtualFile& file) {
// Read NSO header
NroHeader nro_header{};
- file.Seek(0, SEEK_SET);
- if (sizeof(NroHeader) != file.ReadBytes(&nro_header, sizeof(NroHeader))) {
+ if (sizeof(NroHeader) != file->ReadObject(&nro_header)) {
return FileType::Error;
}
if (nro_header.magic == Common::MakeMagic('N', 'R', 'O', '0')) {
@@ -67,16 +65,10 @@ static constexpr u32 PageAlignSize(u32 size) {
return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
}
-bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
- FileUtil::IOFile file(path, "rb");
- if (!file.IsOpen()) {
- return {};
- }
-
+bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) {
// Read NSO header
NroHeader nro_header{};
- file.Seek(0, SEEK_SET);
- if (sizeof(NroHeader) != file.ReadBytes(&nro_header, sizeof(NroHeader))) {
+ if (sizeof(NroHeader) != file->ReadObject(&nro_header)) {
return {};
}
if (nro_header.magic != Common::MakeMagic('N', 'R', 'O', '0')) {
@@ -85,10 +77,9 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
// Build program image
Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("");
- std::vector<u8> program_image;
- program_image.resize(PageAlignSize(nro_header.file_size));
- file.Seek(0, SEEK_SET);
- file.ReadBytes(program_image.data(), 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))
+ return {};
for (int i = 0; i < nro_header.segments.size(); ++i) {
codeset->segments[i].addr = nro_header.segments[i].offset;
@@ -111,7 +102,7 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
program_image.resize(static_cast<u32>(program_image.size()) + bss_size);
// Load codeset for current process
- codeset->name = path;
+ codeset->name = file->GetName();
codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image));
Core::CurrentProcess()->LoadModule(codeset, load_base);
@@ -122,14 +113,11 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
if (is_loaded) {
return ResultStatus::ErrorAlreadyLoaded;
}
- if (!file.IsOpen()) {
- return ResultStatus::Error;
- }
// Load NRO
static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR};
- if (!LoadNro(filepath, base_addr)) {
+ if (!LoadNro(file, base_addr)) {
return ResultStatus::ErrorInvalidFormat;
}