diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/loader/nro.cpp | 9 | ||||
| -rw-r--r-- | src/core/loader/nro.h | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 16d5883ee..4fad0c0dd 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -128,8 +128,8 @@ static constexpr u32 PageAlignSize(u32 size) { | |||
| 128 | return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; | 128 | return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | /*static*/ bool AppLoader_NRO::LoadNro(Kernel::Process& process, const std::vector<u8>& data, | 131 | static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data, |
| 132 | const std::string& name, VAddr load_base) { | 132 | const std::string& name, VAddr load_base) { |
| 133 | if (data.size() < sizeof(NroHeader)) { | 133 | if (data.size() < sizeof(NroHeader)) { |
| 134 | return {}; | 134 | return {}; |
| 135 | } | 135 | } |
| @@ -195,8 +195,9 @@ static constexpr u32 PageAlignSize(u32 size) { | |||
| 195 | return true; | 195 | return true; |
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base) { | 198 | bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, |
| 199 | return LoadNro(process, file.ReadAllBytes(), file.GetName(), load_base); | 199 | VAddr load_base) { |
| 200 | return LoadNroImpl(process, file.ReadAllBytes(), file.GetName(), load_base); | ||
| 200 | } | 201 | } |
| 201 | 202 | ||
| 202 | ResultStatus AppLoader_NRO::Load(Kernel::Process& process) { | 203 | ResultStatus AppLoader_NRO::Load(Kernel::Process& process) { |
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h index 6a63d1a7a..6deff3a51 100644 --- a/src/core/loader/nro.h +++ b/src/core/loader/nro.h | |||
| @@ -45,9 +45,6 @@ public: | |||
| 45 | ResultStatus ReadTitle(std::string& title) override; | 45 | ResultStatus ReadTitle(std::string& title) override; |
| 46 | bool IsRomFSUpdatable() const override; | 46 | bool IsRomFSUpdatable() const override; |
| 47 | 47 | ||
| 48 | static bool LoadNro(Kernel::Process& process, const std::vector<u8>& data, | ||
| 49 | const std::string& name, VAddr load_base); | ||
| 50 | |||
| 51 | private: | 48 | private: |
| 52 | bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base); | 49 | bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base); |
| 53 | 50 | ||