diff options
Diffstat (limited to 'src/core/loader/nso.h')
| -rw-r--r-- | src/core/loader/nso.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h index 386f4d39a..3f7567500 100644 --- a/src/core/loader/nso.h +++ b/src/core/loader/nso.h | |||
| @@ -15,29 +15,22 @@ namespace Loader { | |||
| 15 | /// Loads an NSO file | 15 | /// Loads an NSO file |
| 16 | class AppLoader_NSO final : public AppLoader, Linker { | 16 | class AppLoader_NSO final : public AppLoader, Linker { |
| 17 | public: | 17 | public: |
| 18 | AppLoader_NSO(FileUtil::IOFile&& file, std::string filepath); | 18 | explicit AppLoader_NSO(FileSys::VirtualFile file); |
| 19 | 19 | ||
| 20 | /** | 20 | /** |
| 21 | * Returns the type of the file | 21 | * Returns the type of the file |
| 22 | * @param file FileUtil::IOFile open file | 22 | * @param file std::shared_ptr<VfsFile> open file |
| 23 | * @param filepath Path of the file that we are opening. | ||
| 24 | * @return FileType found, or FileType::Error if this loader doesn't know it | 23 | * @return FileType found, or FileType::Error if this loader doesn't know it |
| 25 | */ | 24 | */ |
| 26 | static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath); | 25 | static FileType IdentifyType(const FileSys::VirtualFile& file); |
| 27 | 26 | ||
| 28 | FileType GetFileType() override { | 27 | FileType GetFileType() override { |
| 29 | return IdentifyType(file, filepath); | 28 | return IdentifyType(file); |
| 30 | } | 29 | } |
| 31 | 30 | ||
| 32 | static VAddr LoadModule(const std::string& name, const std::vector<u8>& file_data, | 31 | static VAddr LoadModule(FileSys::VirtualFile file, VAddr load_base); |
| 33 | VAddr load_base); | ||
| 34 | |||
| 35 | static VAddr LoadModule(const std::string& path, VAddr load_base); | ||
| 36 | 32 | ||
| 37 | ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override; | 33 | ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override; |
| 38 | |||
| 39 | private: | ||
| 40 | std::string filepath; | ||
| 41 | }; | 34 | }; |
| 42 | 35 | ||
| 43 | } // namespace Loader | 36 | } // namespace Loader |