The-Homebrew-Cloud/WUMSLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/WUMSLoader.git synced 2024-11-30 11:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change address/endAddress in ModuleData to startAddress/endAddress

Browse Source
This commit is contained in:
Maschell 2020-05-03 00:06:11 +02:00
parent 48b5f853e3
commit d36ad9bf3d
7 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
relocator/src/ModuleDataPersistence.cpp
View File

@ -26,8 +26,8 @@ bool ModuleDataPersistence::saveModuleData(module_information_t * moduleInformat
module_data->bssSize = module->getBSSSize(); module_data->bssSize = module->getBSSSize();
module_data->sbssAddr = module->getSBSSAddr(); module_data->sbssAddr = module->getSBSSAddr();
module_data->sbssSize = module->getSBSSSize(); module_data->sbssSize = module->getSBSSSize();
module_data->address = module->getAddress(); module_data->endAddress = module->getStartAddress();
module_data->size = module->getSize(); module_data->startAddress = module->getEndAddress();
module_data->entrypoint = module->getEntrypoint(); module_data->entrypoint = module->getEntrypoint();
@ -65,8 +65,8 @@ std::vector<ModuleData*> ModuleDataPersistence::loadModuleData(module_informatio
moduleData->setBSSLocation(module_data->bssAddr, module_data->bssSize); moduleData->setBSSLocation(module_data->bssAddr, module_data->bssSize);
moduleData->setSBSSLocation(module_data->sbssAddr, module_data->sbssSize); moduleData->setSBSSLocation(module_data->sbssAddr, module_data->sbssSize);
moduleData->setEntrypoint(module_data->entrypoint); moduleData->setEntrypoint(module_data->entrypoint);
moduleData->setAddress(module_data->address); moduleData->setStartAddress(module_data->startAddress);
moduleData->setSize(module_data->size); moduleData->setEndAddress(module_data->endAddress);
for(uint32_t j = 0; j < DYN_LINK_RELOCATION_LIST_LENGTH; j++) { for(uint32_t j = 0; j < DYN_LINK_RELOCATION_LIST_LENGTH; j++) {
dyn_linking_relocation_entry_t * linking_entry = &(module_data->linking_entries[j]); dyn_linking_relocation_entry_t * linking_entry = &(module_data->linking_entries[j]);

4
source/common/module_defines.h
View File

@ -40,8 +40,8 @@ struct module_information_single_t {
uint32_t sbssAddr; uint32_t sbssAddr;
uint32_t sbssSize; uint32_t sbssSize;
uint32_t entrypoint; uint32_t entrypoint;
uint32_t address; uint32_t startAddress;
uint32_t size; uint32_t endAddress;
}; };
#define MAXIMUM_MODULES 8 #define MAXIMUM_MODULES 8

1
source/common/relocation_defines.h
View File

@ -14,6 +14,7 @@ typedef enum RelocationType{
} RelocationType; } RelocationType;
typedef struct relocation_trampolin_entry_t { typedef struct relocation_trampolin_entry_t {
uint32_t id;
uint32_t trampolin[4]; uint32_t trampolin[4];
RelocationTrampolinStatus status = RELOC_TRAMP_FREE; RelocationTrampolinStatus status = RELOC_TRAMP_FREE;
} relocation_trampolin_entry_t; } relocation_trampolin_entry_t;

9
source/main.cpp
View File

@ -81,13 +81,11 @@ int main(int argc, char **argv) {
// Currently the size of the .init is ~ 0x24 bytes. We substract 0x100 to be safe. // Currently the size of the .init is ~ 0x24 bytes. We substract 0x100 to be safe.
uint32_t textSectionStart = textStart() - 0x1000; uint32_t textSectionStart = textStart() - 0x1000;
*gModuleData = {};
DirList setupModules("fs:/vol/external01/wiiu/modules/setup", ".rpx", DirList::Files, 1); DirList setupModules("fs:/vol/external01/wiiu/modules/setup", ".rpx", DirList::Files, 1);
setupModules.SortList(); setupModules.SortList();
for(int i = 0; i < setupModules.GetFilecount(); i++) { for(int i = 0; i < setupModules.GetFilecount(); i++) {
*gModuleData = {}; memset((void*)gModuleData, 0, sizeof(module_information_t));
DEBUG_FUNCTION_LINE("Trying to run %s",setupModules.GetFilepath(i)); DEBUG_FUNCTION_LINE("Trying to run %s",setupModules.GetFilepath(i));
ModuleData * moduleData = ModuleDataFactory::load(setupModules.GetFilepath(i), 0x00900000, 0x01000000 - textSectionStart, gModuleData->trampolines, DYN_LINK_TRAMPOLIN_LIST_LENGTH); ModuleData * moduleData = ModuleDataFactory::load(setupModules.GetFilepath(i), 0x00900000, 0x01000000 - textSectionStart, gModuleData->trampolines, DYN_LINK_TRAMPOLIN_LIST_LENGTH);
if(moduleData == NULL) { if(moduleData == NULL) {
@ -115,13 +113,12 @@ int main(int argc, char **argv) {
delete moduleData; delete moduleData;
} }
*gModuleData = {}; memset((void*)gModuleData, 0, sizeof(module_information_t));
DirList modules("fs:/vol/external01/wiiu/modules", ".rpx", DirList::Files, 1); DirList modules("fs:/vol/external01/wiiu/modules", ".rpx", DirList::Files, 1);
modules.SortList(); modules.SortList();
for(int i = 0; i < modules.GetFilecount(); i++) { for(int i = 0; i < modules.GetFilecount(); i++) {
*gModuleData = {};
DEBUG_FUNCTION_LINE("Loading module %s",modules.GetFilepath(i)); DEBUG_FUNCTION_LINE("Loading module %s",modules.GetFilepath(i));
ModuleData * moduleData = ModuleDataFactory::load(modules.GetFilepath(i), 0x00900000, 0x01000000 - textSectionStart, gModuleData->trampolines, DYN_LINK_TRAMPOLIN_LIST_LENGTH); ModuleData * moduleData = ModuleDataFactory::load(modules.GetFilepath(i), 0x00900000, 0x01000000 - textSectionStart, gModuleData->trampolines, DYN_LINK_TRAMPOLIN_LIST_LENGTH);
@ -130,7 +127,7 @@ int main(int argc, char **argv) {
DEBUG_FUNCTION_LINE("Successfully loaded %s", modules.GetFilepath(i)); DEBUG_FUNCTION_LINE("Successfully loaded %s", modules.GetFilepath(i));
ModuleDataPersistence::saveModuleData(gModuleData, moduleData); ModuleDataPersistence::saveModuleData(gModuleData, moduleData);
delete moduleData; delete moduleData;
}else{ } else {
DEBUG_FUNCTION_LINE("Failed to load %s", modules.GetFilepath(i)); DEBUG_FUNCTION_LINE("Failed to load %s", modules.GetFilepath(i));
} }
} }

20
source/module/ModuleData.h
View File

@ -48,12 +48,12 @@ public:
this->entrypoint = addr; this->entrypoint = addr;
} }
void setAddress(uint32_t addr) { void setStartAddress(uint32_t addr) {
this->address = addr; this->startAddress = addr;
} }
void setSize(uint32_t size) { void setEndAddress(uint32_t endAddress) {
this->size = size; this->endAddress = endAddress;
} }
void addRelocationData(RelocationData * relocation_data) { void addRelocationData(RelocationData * relocation_data) {
@ -84,12 +84,12 @@ public:
return entrypoint; return entrypoint;
} }
uint32_t getAddress() { uint32_t getStartAddress() {
return address; return startAddress;
} }
uint32_t getSize() { uint32_t getEndAddress() {
return address; return endAddress;
} }
std::string toString(); std::string toString();
@ -100,7 +100,7 @@ private:
uint32_t bssSize = 0; uint32_t bssSize = 0;
uint32_t sbssAddr = 0; uint32_t sbssAddr = 0;
uint32_t sbssSize = 0; uint32_t sbssSize = 0;
uint32_t address = 0; uint32_t startAddress = 0;
uint32_t size = 0; uint32_t endAddress = 0;
uint32_t entrypoint = 0; uint32_t entrypoint = 0;
}; };

13
source/module/ModuleDataFactory.cpp
View File

@ -52,6 +52,8 @@ ModuleData * ModuleDataFactory::load(std::string path, uint32_t destination_addr
uint32_t entrypoint = offset_text + (uint32_t) reader.get_entry() - 0x02000000; uint32_t entrypoint = offset_text + (uint32_t) reader.get_entry() - 0x02000000;
uint32_t totalSize = 0; uint32_t totalSize = 0;
uint32_t endAddress = 0;
for(uint32_t i = 0; i < sec_num; ++i ) { for(uint32_t i = 0; i < sec_num; ++i ) {
section* psec = reader.sections[i]; section* psec = reader.sections[i];
@ -104,6 +106,10 @@ ModuleData * ModuleDataFactory::load(std::string path, uint32_t destination_addr
} }
totalSize += sectionSize; totalSize += sectionSize;
if(endAddress < destination + sectionSize){
endAddress = destination + sectionSize;
}
DCFlushRange((void*)destination, sectionSize); DCFlushRange((void*)destination, sectionSize);
ICInvalidateRange((void*)destination, sectionSize); ICInvalidateRange((void*)destination, sectionSize);
} }
@ -133,14 +139,15 @@ ModuleData * ModuleDataFactory::load(std::string path, uint32_t destination_addr
free(destinations); free(destinations);
moduleData->setEntrypoint(entrypoint); moduleData->setEntrypoint(entrypoint);
moduleData->setAddress(destination_address); moduleData->setStartAddress(destination_address);
moduleData->setSize(totalSize); moduleData->setEndAddress(endAddress);
DEBUG_FUNCTION_LINE("Saved entrypoint as %08X", entrypoint); DEBUG_FUNCTION_LINE("Saved entrypoint as %08X", entrypoint);
DEBUG_FUNCTION_LINE("Saved startAddress as %08X", destination_address);
DEBUG_FUNCTION_LINE("Saved endAddress as %08X", endAddress);
return moduleData; return moduleData;
} }
std::vector<RelocationData*> ModuleDataFactory::getImportRelocationData(elfio& reader, uint8_t ** destinations) { std::vector<RelocationData*> ModuleDataFactory::getImportRelocationData(elfio& reader, uint8_t ** destinations) {
std::vector<RelocationData*> result; std::vector<RelocationData*> result;
std::map<uint32_t,std::string> infoMap; std::map<uint32_t,std::string> infoMap;

8
source/module/ModuleDataPersistence.cpp
View File

@ -30,8 +30,8 @@ bool ModuleDataPersistence::saveModuleData(module_information_t * moduleInformat
module_data->bssSize = module->getBSSSize(); module_data->bssSize = module->getBSSSize();
module_data->sbssAddr = module->getSBSSAddr(); module_data->sbssAddr = module->getSBSSAddr();
module_data->sbssSize = module->getSBSSSize(); module_data->sbssSize = module->getSBSSSize();
module_data->address = module->getAddress(); module_data->startAddress = module->getStartAddress();
module_data->size = module->getSize(); module_data->endAddress = module->getEndAddress();
module_data->entrypoint = module->getEntrypoint(); module_data->entrypoint = module->getEntrypoint();
@ -68,8 +68,8 @@ std::vector<ModuleData*> ModuleDataPersistence::loadModuleData(module_informatio
moduleData->setBSSLocation(module_data->bssAddr, module_data->bssSize); moduleData->setBSSLocation(module_data->bssAddr, module_data->bssSize);
moduleData->setSBSSLocation(module_data->sbssAddr, module_data->sbssSize); moduleData->setSBSSLocation(module_data->sbssAddr, module_data->sbssSize);
moduleData->setEntrypoint(module_data->entrypoint); moduleData->setEntrypoint(module_data->entrypoint);
moduleData->setAddress(module_data->address); moduleData->setStartAddress(module_data->startAddress);
moduleData->setSize(module_data->size); moduleData->setEndAddress(module_data->endAddress);
for(uint32_t j = 0; j < DYN_LINK_RELOCATION_LIST_LENGTH; j++) { for(uint32_t j = 0; j < DYN_LINK_RELOCATION_LIST_LENGTH; j++) {
dyn_linking_relocation_entry_t * linking_entry = &(module_data->linking_entries[j]); dyn_linking_relocation_entry_t * linking_entry = &(module_data->linking_entries[j]);