From 8c1c3e91e3fa8e8a817a298f0f6916c2debc33e9 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Mon, 27 Apr 2020 19:01:11 +0200
Subject: [PATCH] Move the loaded .rpx into the end of the memory area

---
 src/main.cpp                     |  2 +-
 src/module/ModuleDataFactory.cpp | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7e572ad..8ce4274 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,7 +64,7 @@ extern "C" int _start(int argc, char **argv) {
         uint32_t moduleDataStartAddress = ((uint32_t) gModuleData + sizeof(module_information_t));
         moduleDataStartAddress = (moduleDataStartAddress + 0x10000) & 0xFFFF0000;
 
-        ModuleData * moduleData = ModuleDataFactory::load("sd:/wiiu/payload.rpx", ApplicationMemoryEnd, 0x00FFF000 - ApplicationMemoryEnd, gModuleData->trampolines, DYN_LINK_TRAMPOLIN_LIST_LENGTH);
+        ModuleData * moduleData = ModuleDataFactory::load("sd:/wiiu/payload.rpx", 0x00FFF000, 0x00FFF000 - ApplicationMemoryEnd, gModuleData->trampolines, DYN_LINK_TRAMPOLIN_LIST_LENGTH);
         if(moduleData != NULL) {
             DEBUG_FUNCTION_LINE("Loaded module data\n");
             std::vector<RelocationData *> relocData = moduleData->getRelocationDataList();
diff --git a/src/module/ModuleDataFactory.cpp b/src/module/ModuleDataFactory.cpp
index 22cd562..0e728dc 100644
--- a/src/module/ModuleDataFactory.cpp
+++ b/src/module/ModuleDataFactory.cpp
@@ -44,7 +44,25 @@ ModuleData * ModuleDataFactory::load(std::string path, uint32_t destination_addr
 
     uint8_t **destinations = (uint8_t **) malloc(sizeof(uint8_t *) * sec_num);
 
-    uint32_t baseOffset = destination_address;
+
+    uint32_t sizeOfModule = 0;
+    for(uint32_t i = 0; i < sec_num; ++i ) {
+        section* psec = reader.sections[i];
+        if (psec->get_type() == 0x80000002) {
+            continue;
+        }
+
+        if ((psec->get_type() == SHT_PROGBITS || psec->get_type() == SHT_NOBITS) && (psec->get_flags() & SHF_ALLOC)) {
+            sizeOfModule += psec->get_size() + 1;
+        }
+    }
+
+    if(sizeOfModule > maximum_size){
+        DEBUG_FUNCTION_LINE("Module is too big.");
+        return NULL;
+    }
+
+    uint32_t baseOffset = (destination_address -sizeOfModule) & 0xFFFFFF00;
 
     uint32_t offset_text = baseOffset;
     uint32_t offset_data = offset_text;
@@ -87,10 +105,10 @@ ModuleData * ModuleDataFactory::load(std::string path, uint32_t destination_addr
             const char* p = reader.sections[i]->get_data();
 
             if(psec->get_type() == SHT_NOBITS) {
-                DEBUG_FUNCTION_LINE("memset section %s %08X to 0 (%d bytes)\n", psec->get_name().c_str(), destination, sectionSize);
+                DEBUG_FUNCTION_LINE("memset section %s %08X [%08X] to 0 (%d bytes)\n", psec->get_name().c_str(), destination, destination + sectionSize, sectionSize);
                 memset((void*) destination, 0, sectionSize);
             } else if(psec->get_type() == SHT_PROGBITS) {
-                DEBUG_FUNCTION_LINE("Copy section %s %08X -> %08X (%d bytes)\n", psec->get_name().c_str(), p, destination, sectionSize);
+                DEBUG_FUNCTION_LINE("Copy section %s %08X -> %08X [%08X] (%d bytes)\n", psec->get_name().c_str(), p, destination, destination + sectionSize, sectionSize);
                 memcpy((void*) destination, p, sectionSize);
             }
 
@@ -241,6 +259,7 @@ bool ModuleDataFactory::linkSection(elfio& reader, uint32_t section_index, uint3
                     return false;
                 }
             }
+            DEBUG_FUNCTION_LINE("done\n");
         }
     }
     return true;