From 23ce4f5afc66eb04a7aafc4f89685b8109b8d5c6 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 9 Oct 2017 21:39:32 -0400 Subject: loader: Various improvements for NSO/NRO loaders. --- src/core/loader/nso.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/core/loader/nso.h') 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 { /// Loads an NSO file class AppLoader_NSO final : public AppLoader, Linker { public: - AppLoader_NSO(FileUtil::IOFile&& file, std::string filename, std::string filepath) - : AppLoader(std::move(file)), filename(std::move(filename)), filepath(std::move(filepath)) { + AppLoader_NSO(FileUtil::IOFile&& file, std::string filepath) + : AppLoader(std::move(file)), filepath(std::move(filepath)) { } /** @@ -35,10 +35,8 @@ public: ResultStatus Load() override; private: - VAddr GetEntryPoint(VAddr load_base) const; - bool LoadNso(const std::string& path, VAddr load_base); + VAddr LoadNso(const std::string& path, VAddr load_base, bool relocate = false); - std::string filename; std::string filepath; }; -- cgit v1.2.3