The-Homebrew-Cloud/WUMSLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/WUMSLoader.git synced 2024-10-31 21:35:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Maschell 2021-02-19 17:01:21 +01:00
parent 07adc02d53
commit 4eff524ab3
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
relocator/src/ModuleDataPersistence.cpp
View File

@ -1,13 +1,11 @@
#include "ModuleDataPersistence.h" #include "ModuleDataPersistence.h"
#include "DynamicLinkingHelper.h" #include "DynamicLinkingHelper.h"
#include "../../source/module/ModuleData.h"
#include "../../source/module/RelocationData.h"
#include <coreinit/cache.h> #include <coreinit/cache.h>
#include <wums.h> #include <wums.h>
std::vector<ModuleData> ModuleDataPersistence::loadModuleData(module_information_t *moduleInformation) { std::vector<ModuleData> ModuleDataPersistence::loadModuleData(module_information_t *moduleInformation) {
std::vector<ModuleData> result; std::vector<ModuleData> result;
if (moduleInformation == NULL) { if (moduleInformation == nullptr) {
DEBUG_FUNCTION_LINE("moduleInformation == NULL\n"); DEBUG_FUNCTION_LINE("moduleInformation == NULL\n");
return result; return result;
} }
@ -37,48 +35,46 @@ std::vector<ModuleData> ModuleDataPersistence::loadModuleData(module_information
moduleData.setExportName(module_data->module_export_name); moduleData.setExportName(module_data->module_export_name);
for (uint32_t j = 0; j < EXPORT_ENTRY_LIST_LENGTH; j++) { for (auto & export_entry : module_data->export_entries) {
export_data_t *export_entry = &(module_data->export_entries[j]); if (export_entry.address == 0) {
if (export_entry->address == 0) {
continue; continue;
} }
moduleData.addExportData(ExportData(static_cast<wums_entry_type_t>(export_entry->type), export_entry->name, reinterpret_cast<const void *>(export_entry->address))); moduleData.addExportData(ExportData(static_cast<wums_entry_type_t>(export_entry.type), export_entry.name, reinterpret_cast<const void *>(export_entry.address)));
} }
for (uint32_t j = 0; j < HOOK_ENTRY_LIST_LENGTH; j++) { for (auto & hook_entrie : module_data->hook_entries) {
hook_data_t *hook_entry = &(module_data->hook_entries[j]); hook_data_t *hook_entry = &hook_entrie;
if (hook_entry->target == 0) { if (hook_entry->target == 0) {
continue; continue;
} }
moduleData.addHookData(HookData(static_cast<wums_hook_type_t>(hook_entry->type), reinterpret_cast<const void *>(hook_entry->target))); moduleData.addHookData(HookData(static_cast<wums_hook_type_t>(hook_entry->type), reinterpret_cast<const void *>(hook_entry->target)));
} }
for (uint32_t j = 0; j < DYN_LINK_RELOCATION_LIST_LENGTH; j++) { for (auto & linking_entry : module_data->linking_entries) {
dyn_linking_relocation_entry_t *linking_entry = &(module_data->linking_entries[j]); if (linking_entry.destination == nullptr) {
if (linking_entry->destination == NULL) {
break; break;
} }
dyn_linking_import_t *importEntry = linking_entry->importEntry; dyn_linking_import_t *importEntry = linking_entry.importEntry;
if (importEntry == NULL) { if (importEntry == nullptr) {
DEBUG_FUNCTION_LINE("importEntry was NULL, skipping relocation entry\n"); DEBUG_FUNCTION_LINE("importEntry was NULL, skipping relocation entry\n");
continue; continue;
} }
if (importEntry->importName == NULL) { if (importEntry->importName == nullptr) {
DEBUG_FUNCTION_LINE("importEntry->importName was NULL, skipping relocation entry\n"); DEBUG_FUNCTION_LINE("importEntry->importName was NULL, skipping relocation entry\n");
continue; continue;
} }
dyn_linking_function_t *functionEntry = linking_entry->functionEntry; dyn_linking_function_t *functionEntry = linking_entry.functionEntry;
if (functionEntry == NULL) { if (functionEntry == nullptr) {
DEBUG_FUNCTION_LINE("functionEntry was NULL, skipping relocation entry\n"); DEBUG_FUNCTION_LINE("functionEntry was NULL, skipping relocation entry\n");
continue; continue;
} }
if (functionEntry->functionName == NULL) { if (functionEntry->functionName == nullptr) {
DEBUG_FUNCTION_LINE("functionEntry->functionName was NULL, skipping relocation entry\n"); DEBUG_FUNCTION_LINE("functionEntry->functionName was NULL, skipping relocation entry\n");
continue; continue;
} }
ImportRPLInformation rplInfo(importEntry->importName, importEntry->isData); ImportRPLInformation rplInfo(importEntry->importName, importEntry->isData);
RelocationData reloc(linking_entry->type, linking_entry->offset, linking_entry->addend, linking_entry->destination, functionEntry->functionName, rplInfo); RelocationData reloc(linking_entry.type, linking_entry.offset, linking_entry.addend, linking_entry.destination, functionEntry->functionName, rplInfo);
moduleData.addRelocationData(reloc); moduleData.addRelocationData(reloc);
} }

44
source/module/ModuleData.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* Copyright (C) 2018 Maschell * Copyright (C) 2018-2021 Maschell
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -27,11 +27,9 @@
class ModuleData { class ModuleData {
public: public:
ModuleData() { ModuleData() = default;
}
~ModuleData() { ~ModuleData() = default;
}
void setBSSLocation(uint32_t addr, uint32_t size) { void setBSSLocation(uint32_t addr, uint32_t size) {
this->bssAddr = addr; this->bssAddr = addr;
@ -51,15 +49,15 @@ public:
this->startAddress = addr; this->startAddress = addr;
} }
void setEndAddress(uint32_t endAddress) { void setEndAddress(uint32_t _endAddress) {
this->endAddress = endAddress; this->endAddress = _endAddress;
} }
void addRelocationData(const RelocationData &relocation_data) { void addRelocationData(const RelocationData &relocation_data) {
relocation_data_list.push_back(relocation_data); relocation_data_list.push_back(relocation_data);
} }
const std::vector<RelocationData> &getRelocationDataList() const { [[nodiscard]] const std::vector<RelocationData> &getRelocationDataList() const {
return relocation_data_list; return relocation_data_list;
} }
@ -67,7 +65,7 @@ public:
export_data_list.push_back(data); export_data_list.push_back(data);
} }
const std::vector<ExportData> &getExportDataList() const { [[nodiscard]] const std::vector<ExportData> &getExportDataList() const {
return export_data_list; return export_data_list;
} }
@ -75,7 +73,7 @@ public:
hook_data_list.push_back(data); hook_data_list.push_back(data);
} }
const std::vector<HookData> &getHookDataList() const { [[nodiscard]] const std::vector<HookData> &getHookDataList() const {
return hook_data_list; return hook_data_list;
} }
@ -83,60 +81,60 @@ public:
section_info_list[sectionInfo.getName()] = sectionInfo; section_info_list[sectionInfo.getName()] = sectionInfo;
} }
const std::map<std::string, SectionInfo> &getSectionInfoList() const { [[nodiscard]] const std::map<std::string, SectionInfo> &getSectionInfoList() const {
return section_info_list; return section_info_list;
} }
std::optional<SectionInfo> getSectionInfo(const std::string &sectionName) const { [[nodiscard]] std::optional<SectionInfo> getSectionInfo(const std::string &sectionName) const {
if (getSectionInfoList().count(sectionName) > 0) { if (getSectionInfoList().count(sectionName) > 0) {
return section_info_list.at(sectionName); return section_info_list.at(sectionName);
} }
return std::nullopt; return std::nullopt;
} }
uint32_t getBSSAddr() const { [[nodiscard]] uint32_t getBSSAddr() const {
return bssAddr; return bssAddr;
} }
uint32_t getBSSSize() const { [[nodiscard]] uint32_t getBSSSize() const {
return bssSize; return bssSize;
} }
uint32_t getSBSSAddr() const { [[nodiscard]] uint32_t getSBSSAddr() const {
return sbssAddr; return sbssAddr;
} }
uint32_t getSBSSSize() const { [[nodiscard]] uint32_t getSBSSSize() const {
return sbssSize; return sbssSize;
} }
uint32_t getEntrypoint() const { [[nodiscard]] uint32_t getEntrypoint() const {
return entrypoint; return entrypoint;
} }
uint32_t getStartAddress() const { [[nodiscard]] uint32_t getStartAddress() const {
return startAddress; return startAddress;
} }
uint32_t getEndAddress() const { [[nodiscard]] uint32_t getEndAddress() const {
return endAddress; return endAddress;
} }
std::string toString() const; [[nodiscard]] std::string toString() const;
void setExportName(const std::string &name) { void setExportName(const std::string &name) {
this->export_name = name; this->export_name = name;
} }
std::string getExportName() const { [[nodiscard]] std::string getExportName() const {
return this->export_name; return this->export_name;
} }
bool isSkipEntrypoint() const { [[nodiscard]] bool isSkipEntrypoint() const {
return this->skipEntrypoint; return this->skipEntrypoint;
} }
bool isInitBeforeRelocationDoneHook() const { [[nodiscard]] bool isInitBeforeRelocationDoneHook() const {
return this->initBeforeRelocationDoneHook; return this->initBeforeRelocationDoneHook;
} }