From 8c92435ded5c9c89290604a03e307c038b4d4117 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 30 Sep 2017 14:15:09 -0400 Subject: nso: Refactor and allocate .bss section. --- src/core/loader/nso.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'src/core/loader/nso.h') diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h index 39a9bd3d9..2d9e60ad7 100644 --- a/src/core/loader/nso.h +++ b/src/core/loader/nso.h @@ -4,9 +4,11 @@ #pragma once +#include #include #include "common/common_types.h" #include "common/file_util.h" +#include "core/hle/kernel/kernel.h" #include "core/loader/loader.h" namespace Loader { @@ -15,7 +17,8 @@ namespace Loader { class AppLoader_NSO final : public AppLoader { 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(std::move(file)), filename(std::move(filename)), filepath(std::move(filepath)) { + } /** * Returns the type of the file @@ -31,6 +34,26 @@ public: ResultStatus Load() override; private: + struct Symbol { + Symbol(std::string&& name, u64 value) : name(std::move(name)), value(value) {} + std::string name; + u64 value; + }; + + struct Import { + VAddr ea; + s64 addend; + }; + + void WriteRelocations(const std::vector& symbols, VAddr load_base, + u64 relocation_offset, u64 size, bool is_jump_relocation); + VAddr GetEntryPoint() const; + bool LoadNso(const std::string& path, VAddr load_base); + void Relocate(VAddr load_base, VAddr dynamic_section_addr); + + std::map imports; + std::map exports; + std::string filename; std::string filepath; }; -- cgit v1.2.3