From c65ac492380f5baa85cb3225723b4363d07a2361 Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Wed, 17 Jan 2018 17:01:10 -0300
Subject: Remove relocation on NSO/NRO

---
 src/core/loader/nro.cpp |  9 ---------
 src/core/loader/nso.cpp | 10 +---------
 src/core/loader/nso.h   |  2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)

(limited to 'src/core/loader')

diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index a5d09512b..66c61b038 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -118,13 +118,6 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
     }
     program_image.resize(PageAlignSize(static_cast<u32>(program_image.size()) + bss_size));
 
-    // Relocate symbols if there was a proper MOD header - This must happen after the image has been
-    // loaded into memory
-    if (has_mod_header) {
-        Relocate(program_image, nro_header.module_header_offset + mod_header.dynamic_offset,
-                 load_base);
-    }
-
     // Load codeset for current process
     codeset->name = path;
     codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image));
@@ -154,8 +147,6 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
         Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION);
     process->Run(base_addr, 48, Kernel::DEFAULT_STACK_SIZE);
 
-    ResolveImports();
-
     is_loaded = true;
     return ResultStatus::Success;
 }
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp
index ff96e129b..ef769dd91 100644
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -88,7 +88,7 @@ static constexpr u32 PageAlignSize(u32 size) {
     return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
 }
 
-VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base, bool relocate) {
+VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base) {
     FileUtil::IOFile file(path, "rb");
     if (!file.IsOpen()) {
         return {};
@@ -135,12 +135,6 @@ VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base, bool relo
     const u32 image_size{PageAlignSize(static_cast<u32>(program_image.size()) + bss_size)};
     program_image.resize(image_size);
 
-    // Relocate symbols if there was a proper MOD header - This must happen after the image has been
-    // loaded into memory
-    if (has_mod_header && relocate) {
-        Relocate(program_image, module_offset + mod_header.dynamic_offset, load_base);
-    }
-
     // Load codeset for current process
     codeset->name = path;
     codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image));
@@ -181,8 +175,6 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
         Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION);
     process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE);
 
-    ResolveImports();
-
     is_loaded = true;
     return ResultStatus::Success;
 }
diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h
index 03424e70d..a24bcdc24 100644
--- a/src/core/loader/nso.h
+++ b/src/core/loader/nso.h
@@ -34,7 +34,7 @@ public:
     ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
 
 private:
-    VAddr LoadNso(const std::string& path, VAddr load_base, bool relocate = false);
+    VAddr LoadNso(const std::string& path, VAddr load_base);
 
     std::string filepath;
 };
-- 
cgit v1.2.3