mirror of
https://github.com/wiiu-env/WUMSLoader.git
synced 2024-11-30 11:34:15 +01:00
Add initial support for storing and loadings hooks of modules (but not calling them)
This commit is contained in:
parent
02441dab81
commit
6cb4f4e358
@ -43,6 +43,15 @@ std::vector<ModuleData> ModuleDataPersistence::loadModuleData(module_information
|
||||
}
|
||||
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++) {
|
||||
hook_data_t *hook_entry = &(module_data->hook_entries[j]);
|
||||
if (hook_entry->target == NULL) {
|
||||
continue;
|
||||
}
|
||||
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++) {
|
||||
dyn_linking_relocation_entry_t *linking_entry = &(module_data->linking_entries[j]);
|
||||
if (linking_entry->destination == NULL) {
|
||||
|
@ -32,12 +32,19 @@ extern "C" {
|
||||
|
||||
#define DYN_LINK_RELOCATION_LIST_LENGTH 500
|
||||
#define EXPORT_ENTRY_LIST_LENGTH 100
|
||||
#define HOOK_ENTRY_LIST_LENGTH 10
|
||||
|
||||
typedef struct hook_data_t {
|
||||
uint32_t type;
|
||||
uint32_t target = 0;
|
||||
} hook_data_t;
|
||||
|
||||
struct module_information_single_t {
|
||||
char path[MAXIMUM_MODULE_PATH_NAME_LENGTH] = ""; // Path where the module is stored
|
||||
dyn_linking_relocation_entry_t linking_entries[DYN_LINK_RELOCATION_LIST_LENGTH];
|
||||
char module_export_name[MAXIMUM_EXPORT_MODULE_NAME_LENGTH];
|
||||
export_data_t export_entries[EXPORT_ENTRY_LIST_LENGTH];
|
||||
hook_data_t hook_entries[HOOK_ENTRY_LIST_LENGTH];
|
||||
int32_t priority; // Priority of this module
|
||||
uint32_t bssAddr;
|
||||
uint32_t bssSize;
|
||||
|
@ -118,6 +118,7 @@ int main(int argc, char **argv) {
|
||||
DirList modules("fs:/vol/external01/wiiu/modules", ".wms", DirList::Files, 1);
|
||||
modules.SortList();
|
||||
uint32_t destination_address = 0x00900000;
|
||||
|
||||
for (int i = 0; i < modules.GetFilecount(); i++) {
|
||||
DEBUG_FUNCTION_LINE("Loading module %s", modules.GetFilepath(i));
|
||||
|
||||
|
23
source/module/HookData.h
Normal file
23
source/module/HookData.h
Normal file
@ -0,0 +1,23 @@
|
||||
#pragma once
|
||||
|
||||
#include <wums.h>
|
||||
|
||||
class HookData {
|
||||
public:
|
||||
HookData(wums_hook_type_t type, const void *target) {
|
||||
this->type = type;
|
||||
this->target = target;
|
||||
}
|
||||
|
||||
const wums_hook_type_t getType() const {
|
||||
return type;
|
||||
}
|
||||
|
||||
const void *getTarget() const {
|
||||
return target;
|
||||
}
|
||||
|
||||
private:
|
||||
wums_hook_type_t type;
|
||||
const void *target;
|
||||
};
|
@ -23,6 +23,7 @@
|
||||
#include "RelocationData.h"
|
||||
#include "SectionInfo.h"
|
||||
#include "ExportData.h"
|
||||
#include "HookData.h"
|
||||
|
||||
class ModuleData {
|
||||
public:
|
||||
@ -69,6 +70,13 @@ public:
|
||||
const std::vector<ExportData> &getExportDataList() const {
|
||||
return export_data_list;
|
||||
}
|
||||
void addHookData(const HookData &data) {
|
||||
hook_data_list.push_back(data);
|
||||
}
|
||||
|
||||
const std::vector<HookData> &getHookDataList() const {
|
||||
return hook_data_list;
|
||||
}
|
||||
|
||||
void addSectionInfo(const SectionInfo §ionInfo) {
|
||||
section_info_list[sectionInfo.getName()] = sectionInfo;
|
||||
@ -126,6 +134,7 @@ public:
|
||||
private:
|
||||
std::vector<RelocationData> relocation_data_list;
|
||||
std::vector<ExportData> export_data_list;
|
||||
std::vector<HookData> hook_data_list;
|
||||
std::map<std::string, SectionInfo> section_info_list;
|
||||
|
||||
std::string export_name;
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include "ElfUtils.h"
|
||||
#include "SectionInfo.h"
|
||||
#include "ExportData.h"
|
||||
#include "HookData.h"
|
||||
|
||||
using namespace ELFIO;
|
||||
|
||||
@ -148,6 +149,20 @@ std::optional<ModuleData> ModuleDataFactory::load(std::string path, uint32_t* de
|
||||
}
|
||||
}
|
||||
|
||||
secInfo = moduleData.getSectionInfo(".wums.hooks");
|
||||
if (secInfo && secInfo->getSize() > 0) {
|
||||
size_t entries_count = secInfo->getSize() / sizeof(wums_hook_t);
|
||||
wums_hook_t *hooks = (wums_hook_t *) secInfo->getAddress();
|
||||
if (hooks != NULL) {
|
||||
for (size_t j = 0; j < entries_count; j++) {
|
||||
wums_hook_t * hook = &hooks[j];
|
||||
DEBUG_FUNCTION_LINE("Saving hook of type %08X, target: %08X"/*,pluginData.getPluginInformation()->getName().c_str()*/, hook->type, hook->target);
|
||||
HookData hook_data(hook->type, hook->target);
|
||||
moduleData.addHookData(hook_data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
secInfo = moduleData.getSectionInfo(".wums.meta");
|
||||
if (secInfo && secInfo->getSize() > 0) {
|
||||
wums_entry_t *entries = (wums_entry_t *) secInfo->getAddress();
|
||||
|
@ -27,7 +27,6 @@ bool ModuleDataPersistence::saveModuleData(module_information_t *moduleInformati
|
||||
}
|
||||
|
||||
std::vector<ExportData> exportData = module.getExportDataList();
|
||||
|
||||
for (auto const &curExport : exportData) {
|
||||
bool found = false;
|
||||
for (uint32_t j = 0; j < EXPORT_ENTRY_LIST_LENGTH; j++) {
|
||||
@ -42,6 +41,25 @@ bool ModuleDataPersistence::saveModuleData(module_information_t *moduleInformati
|
||||
}
|
||||
if (!found) {
|
||||
DEBUG_FUNCTION_LINE("Failed to found enough exports slots");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<HookData> hookData = module.getHookDataList();
|
||||
for (auto const &curHook : hookData) {
|
||||
bool found = false;
|
||||
for (uint32_t j = 0; j < HOOK_ENTRY_LIST_LENGTH; j++) {
|
||||
hook_data_t *hook_entry = &(module_data->hook_entries[j]);
|
||||
if (hook_entry->target == NULL) {
|
||||
hook_entry->type = curHook.getType();
|
||||
hook_entry->target = (uint32_t) curHook.getTarget();
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
DEBUG_FUNCTION_LINE("Failed to found enough hook slots");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,6 +116,14 @@ std::vector<ModuleData> ModuleDataPersistence::loadModuleData(module_information
|
||||
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++) {
|
||||
hook_data_t *hook_entry = &(module_data->hook_entries[j]);
|
||||
if (hook_entry->target == NULL) {
|
||||
continue;
|
||||
}
|
||||
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++) {
|
||||
dyn_linking_relocation_entry_t *linking_entry = &(module_data->linking_entries[j]);
|
||||
if (linking_entry->destination == NULL) {
|
||||
|
Loading…
Reference in New Issue
Block a user