diff options
| author | 2017-10-09 21:39:32 -0400 | |
|---|---|---|
| committer | 2017-10-09 21:39:32 -0400 | |
| commit | 23ce4f5afc66eb04a7aafc4f89685b8109b8d5c6 (patch) | |
| tree | 168e7793c6d68eb8b195850a056443ea98f430a9 /src/core/loader/nso.h | |
| parent | loader: Add support for NRO, as well as various fixes and shared linker. (diff) | |
| download | yuzu-23ce4f5afc66eb04a7aafc4f89685b8109b8d5c6.tar.gz yuzu-23ce4f5afc66eb04a7aafc4f89685b8109b8d5c6.tar.xz yuzu-23ce4f5afc66eb04a7aafc4f89685b8109b8d5c6.zip | |
loader: Various improvements for NSO/NRO loaders.
Diffstat (limited to 'src/core/loader/nso.h')
| -rw-r--r-- | src/core/loader/nso.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h index 431b960b1..c29803d81 100644 --- a/src/core/loader/nso.h +++ b/src/core/loader/nso.h | |||
| @@ -17,8 +17,8 @@ namespace Loader { | |||
| 17 | /// Loads an NSO file | 17 | /// Loads an NSO file |
| 18 | class AppLoader_NSO final : public AppLoader, Linker { | 18 | class AppLoader_NSO final : public AppLoader, Linker { |
| 19 | public: | 19 | public: |
| 20 | AppLoader_NSO(FileUtil::IOFile&& file, std::string filename, std::string filepath) | 20 | AppLoader_NSO(FileUtil::IOFile&& file, std::string filepath) |
| 21 | : AppLoader(std::move(file)), filename(std::move(filename)), filepath(std::move(filepath)) { | 21 | : AppLoader(std::move(file)), filepath(std::move(filepath)) { |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| @@ -35,10 +35,8 @@ public: | |||
| 35 | ResultStatus Load() override; | 35 | ResultStatus Load() override; |
| 36 | 36 | ||
| 37 | private: | 37 | private: |
| 38 | VAddr GetEntryPoint(VAddr load_base) const; | 38 | VAddr LoadNso(const std::string& path, VAddr load_base, bool relocate = false); |
| 39 | bool LoadNso(const std::string& path, VAddr load_base); | ||
| 40 | 39 | ||
| 41 | std::string filename; | ||
| 42 | std::string filepath; | 40 | std::string filepath; |
| 43 | }; | 41 | }; |
| 44 | 42 | ||