mirror of
https://github.com/wiiu-env/WUMSLoader.git
synced 2024-12-24 15:11:50 +01:00
Move module defines into WUMS
This commit is contained in:
parent
10d74d9f6d
commit
3f6f956b70
@ -3,7 +3,6 @@
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
#include "utils/logger.h"
|
||||
#include "../../source/common/module_defines.h"
|
||||
|
||||
dyn_linking_function_t *DynamicLinkingHelper::getOrAddFunctionEntryByName(dyn_linking_relocation_data_t *data, const char *functionName) {
|
||||
if (data == NULL) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../source/common/dynamic_linking_defines.h"
|
||||
#include <wums.h>
|
||||
#include "utils/logger.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
#include "../../source/common/relocation_defines.h"
|
||||
#include <wums.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -1,6 +1,5 @@
|
||||
#include "ModuleDataPersistence.h"
|
||||
#include "DynamicLinkingHelper.h"
|
||||
#include "../../source/common/module_defines.h"
|
||||
#include "../../source/module/ModuleData.h"
|
||||
#include "../../source/module/RelocationData.h"
|
||||
#include <coreinit/cache.h>
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../source/common/module_defines.h"
|
||||
#include <wums.h>
|
||||
#include "../../source/module/ModuleData.h"
|
||||
|
||||
class ModuleDataPersistence {
|
||||
|
@ -8,13 +8,10 @@
|
||||
#include <coreinit/memorymap.h>
|
||||
#include <map>
|
||||
#include <algorithm>
|
||||
#include "../../source/common/dynamic_linking_defines.h"
|
||||
#include "../../source/common/module_defines.h"
|
||||
#include "../../source/module/RelocationData.h"
|
||||
#include "../../source/module/ModuleData.h"
|
||||
#include "ModuleDataPersistence.h"
|
||||
#include "ElfUtils.h"
|
||||
#include "../../source/common/relocation_defines.h"
|
||||
#include "kernel/kernel_utils.h"
|
||||
#include "hooks_patcher_static.h"
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
#include "../../source/common/module_defines.h"
|
||||
#include <wums.h>
|
||||
#include "hooks.h"
|
||||
#include "utils/logger.h"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "utils/logger.h"
|
||||
#include "utils/function_patcher.h"
|
||||
#include "../../source/common/module_defines.h"
|
||||
#include <wums.h>
|
||||
#include "globals.h"
|
||||
#include <malloc.h>
|
||||
#include <coreinit/dynload.h>
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include "common/relocation_defines.h"
|
||||
#include <wums.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -1,61 +0,0 @@
|
||||
/****************************************************************************
|
||||
* Copyright (C) 2018 Maschell
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define DYN_LINK_FUNCTION_NAME_LENGTH 351
|
||||
#define DYN_LINK_IMPORT_NAME_LENGTH 50
|
||||
|
||||
#define DYN_LINK_FUNCTION_LIST_LENGTH 500
|
||||
#define DYN_LINK_IMPORT_LIST_LENGTH 50
|
||||
|
||||
#define DYN_LINK_TRAMPOLIN_LIST_LENGTH DYN_LINK_FUNCTION_LIST_LENGTH
|
||||
|
||||
typedef struct _dyn_linking_function_t {
|
||||
char functionName[DYN_LINK_FUNCTION_NAME_LENGTH + 1];
|
||||
void *address;
|
||||
} dyn_linking_function_t;
|
||||
|
||||
typedef struct _dyn_linking_import_t {
|
||||
char importName[DYN_LINK_IMPORT_NAME_LENGTH + 1];
|
||||
bool isData = false;
|
||||
} dyn_linking_import_t;
|
||||
|
||||
typedef struct _dyn_linking_relocation_entry_t {
|
||||
dyn_linking_function_t *functionEntry = NULL;
|
||||
dyn_linking_import_t *importEntry = NULL;
|
||||
void *destination = NULL;
|
||||
char type;
|
||||
size_t offset;
|
||||
int32_t addend;
|
||||
} dyn_linking_relocation_entry_t;
|
||||
|
||||
typedef struct _dyn_linking_relocation_data_t {
|
||||
dyn_linking_function_t functions[DYN_LINK_FUNCTION_LIST_LENGTH];
|
||||
dyn_linking_import_t imports[DYN_LINK_IMPORT_LIST_LENGTH];
|
||||
} dyn_linking_relocation_data_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
@ -1,10 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#define EXPORT_MAXIMUM_NAME_LENGTH 50
|
||||
typedef struct export_data_t {
|
||||
uint32_t type;
|
||||
char name[EXPORT_MAXIMUM_NAME_LENGTH];
|
||||
uint32_t address = 0;
|
||||
} export_data_t;
|
@ -1,69 +0,0 @@
|
||||
/****************************************************************************
|
||||
* Copyright (C) 2018-2019 Maschell
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include "dynamic_linking_defines.h"
|
||||
#include "relocation_defines.h"
|
||||
#include "export_defines.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define MAXIMUM_MODULE_PATH_NAME_LENGTH 256
|
||||
#define MAXIMUM_EXPORT_MODULE_NAME_LENGTH 51
|
||||
|
||||
#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;
|
||||
uint32_t sbssAddr;
|
||||
uint32_t sbssSize;
|
||||
uint32_t entrypoint;
|
||||
uint32_t startAddress;
|
||||
uint32_t endAddress;
|
||||
};
|
||||
|
||||
#define MAXIMUM_MODULES 8
|
||||
|
||||
struct module_information_t {
|
||||
int32_t number_used_modules = 0; // Number of used function. Maximum is MAXIMUM_MODULES
|
||||
dyn_linking_relocation_data_t linking_data;
|
||||
relocation_trampolin_entry_t trampolines[DYN_LINK_TRAMPOLIN_LIST_LENGTH];
|
||||
module_information_single_t module_data[MAXIMUM_MODULES];
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
@ -1,20 +0,0 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
|
||||
typedef enum RelocationTrampolinStatus{
|
||||
RELOC_TRAMP_FREE = 0,
|
||||
RELOC_TRAMP_FIXED = 1,
|
||||
RELOC_TRAMP_IMPORT_IN_PROGRESS = 2,
|
||||
RELOC_TRAMP_IMPORT_DONE = 3,
|
||||
} RelocationTrampolinStatus;
|
||||
|
||||
typedef enum RelocationType{
|
||||
RELOC_TYPE_FIXED = 0,
|
||||
RELOC_TYPE_IMPORT = 1
|
||||
} RelocationType;
|
||||
|
||||
typedef struct relocation_trampolin_entry_t {
|
||||
uint32_t id;
|
||||
uint32_t trampolin[4];
|
||||
RelocationTrampolinStatus status = RELOC_TRAMP_FREE;
|
||||
} relocation_trampolin_entry_t;
|
@ -22,8 +22,6 @@
|
||||
#include "ElfUtils.h"
|
||||
#include "kernel.h"
|
||||
|
||||
#include "common/module_defines.h"
|
||||
|
||||
bool CheckRunning() {
|
||||
|
||||
switch (ProcUIProcessMessages(true)) {
|
||||
|
@ -4,7 +4,6 @@
|
||||
#include <vector>
|
||||
#include <coreinit/dynload.h>
|
||||
#include "utils/logger.h"
|
||||
#include "common/module_defines.h"
|
||||
|
||||
dyn_linking_function_t *DynamicLinkingHelper::getOrAddFunctionEntryByName(dyn_linking_relocation_data_t *data, const char *functionName) {
|
||||
if (data == NULL) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "common/dynamic_linking_defines.h"
|
||||
#include <wums.h>
|
||||
#include "utils/logger.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include "common/relocation_defines.h"
|
||||
#include <wums.h>
|
||||
#include "ModuleData.h"
|
||||
#include "elfio/elfio.hpp"
|
||||
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
#include "ModuleDataPersistence.h"
|
||||
#include "DynamicLinkingHelper.h"
|
||||
#include "common/module_defines.h"
|
||||
#include "ModuleData.h"
|
||||
#include "RelocationData.h"
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "common/module_defines.h"
|
||||
#include <wums.h>
|
||||
#include "ModuleData.h"
|
||||
|
||||
class ModuleDataPersistence {
|
||||
|
Loading…
Reference in New Issue
Block a user