Leahnaya/WUMSLoader
1
0
Fork 0
mirror of https://github.com/wiiu-env/WUMSLoader.git synced 2026-09-08 11:25:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix support for loading multiple modules

Browse Source
This commit is contained in:
Maschell
2020-05-28 21:45:44 +02:00
parent b9064883a2
commit fa68c980af
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/module/ModuleDataFactory.cpp
View File

@@ -29,7 +29,7 @@
using namespace ELFIO;
std::optional<ModuleData> ModuleDataFactory::load(std::string path, uint32_t destination_address, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length) {
std::optional<ModuleData> ModuleDataFactory::load(std::string path, uint32_t* destination_address_ptr, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length) {
elfio reader;
ModuleData moduleData;
@@ -43,7 +43,7 @@ std::optional<ModuleData> ModuleDataFactory::load(std::string path, uint32_t des
uint8_t **destinations = (uint8_t **) malloc(sizeof(uint8_t *) * sec_num);
uint32_t baseOffset = destination_address;
uint32_t baseOffset = *destination_address_ptr;
uint32_t offset_text = baseOffset;
uint32_t offset_data = offset_text;
@@ -181,18 +181,20 @@ std::optional<ModuleData> ModuleDataFactory::load(std::string path, uint32_t des
}
}
DCFlushRange((void*)destination_address, totalSize);
ICInvalidateRange((void*)destination_address, totalSize);
DCFlushRange((void*)*destination_address_ptr, totalSize);
ICInvalidateRange((void*)*destination_address_ptr, totalSize);
free(destinations);
moduleData.setEntrypoint(entrypoint);
moduleData.setStartAddress(destination_address);
moduleData.setStartAddress(*destination_address_ptr);
moduleData.setEndAddress(endAddress);
DEBUG_FUNCTION_LINE("Saved entrypoint as %08X", entrypoint);
DEBUG_FUNCTION_LINE("Saved startAddress as %08X", destination_address);
DEBUG_FUNCTION_LINE("Saved startAddress as %08X", *destination_address_ptr);
DEBUG_FUNCTION_LINE("Saved endAddress as %08X", endAddress);
*destination_address_ptr = (*destination_address_ptr + totalSize + 0x100) & 0xFFFFFF00;
return moduleData;
}

2
source/module/ModuleDataFactory.h
View File

@@ -26,7 +26,7 @@
class ModuleDataFactory {
public:
static std::optional<ModuleData> load(std::string path, uint32_t destination_address, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length);
static std::optional<ModuleData> load(std::string path, uint32_t* destination_address_ptr, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length);
static bool linkSection(ELFIO::elfio &reader, uint32_t section_index, uint32_t destination, uint32_t base_text, uint32_t base_data, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length);