BREAKING CHANGES: Update the function_replacement_data_t struct.

This commit is contained in:
Maschell 2022-05-07 23:31:04 +02:00
parent 74c57c89ef
commit 8946ce9464
6 changed files with 16 additions and 28 deletions

View File

@ -1,4 +1,4 @@
FROM wiiuenv/devkitppc:20210917 FROM wiiuenv/devkitppc:20220507
WORKDIR tmp_build WORKDIR tmp_build
COPY . . COPY . .

View File

@ -1,3 +1,3 @@
FROM wiiuenv/devkitppc:20211229 FROM wiiuenv/devkitppc:20220507
WORKDIR project WORKDIR project

View File

@ -1,7 +1,7 @@
[![Publish Docker Image](https://github.com/wiiu-env/libfunctionpatcher/actions/workflows/push_image.yml/badge.svg)](https://github.com/wiiu-env/libfunctionpatcher/actions/workflows/push_image.yml) [![Publish Docker Image](https://github.com/wiiu-env/libfunctionpatcher/actions/workflows/push_image.yml/badge.svg)](https://github.com/wiiu-env/libfunctionpatcher/actions/workflows/push_image.yml)
# libfunctionpatcher # libfunctionpatcher
Requires the [FunctionPatcherModule](https://github.com/wiiu-env/FunctionPatcherModule) to be running via [WUMSLoader](https://github.com/wiiu-env/WUMSLoader). Requires the [FunctionPatcherModule](https://github.com/wiiu-env/FunctionPatcherModule) to be running via [WUMSLoader](https://github.com/wiiu-env/WUMSLoader).
Requires [wut](https://github.com/devkitPro/wut) for building. Requires [wut](https://github.com/devkitPro/wut) for building.
Install via `make install`. Install via `make install`.

View File

@ -100,22 +100,18 @@ typedef enum FunctionPatcherTargetProcess {
FP_TARGET_PROCESS_GAME_AND_MENU = 16, FP_TARGET_PROCESS_GAME_AND_MENU = 16,
} FunctionPatcherTargetProcess; } FunctionPatcherTargetProcess;
#define FUNCTION_REPLACEMENT_DATA_STRUCT_VERSION 0x00000001 typedef uint32_t PatchedFunctionHandle;
#define FUNCTION_REPLACEMENT_DATA_STRUCT_VERSION 0x00000002
typedef struct function_replacement_data_t { typedef struct function_replacement_data_t {
uint32_t VERSION; uint32_t VERSION;
uint32_t physicalAddr; /* [needs to be filled] */ uint32_t physicalAddr; /* [needs to be filled] */
uint32_t virtualAddr; /* [needs to be filled] */ uint32_t virtualAddr; /* [needs to be filled] */
uint32_t replaceAddr; /* [needs to be filled] Address of our replacement function */ uint32_t replaceAddr; /* [needs to be filled] Address of our replacement function */
uint32_t replaceCall; /* [needs to be filled] Address to access the real_function */ uint32_t *replaceCall; /* [needs to be filled] Address to access the real_function */
function_replacement_library_type_t library; /* [needs to be filled] rpl where the function we want to replace is. */ function_replacement_library_type_t library; /* [needs to be filled] rpl where the function we want to replace is. */
char function_name[MAXIMUM_FUNCTION_NAME_LENGTH]; /* [needs to be filled] name of the function we want to replace */ const char *function_name; /* [needs to be filled] name of the function we want to replace */
uint32_t realAddr; /* [will be filled] Address of the real function we want to replace. */ FunctionPatcherTargetProcess targetProcess; /* [will be filled] */
volatile uint32_t replace_data[FUNCTION_PATCHER_METHOD_STORE_SIZE]; /* [will be filled] Space for us to store some jump instructions */
uint32_t restoreInstruction; /* [will be filled] Copy of the instruction we replaced to jump to our code. */
FunctionPatcherFunctionType functionType; /* [will be filled] */
uint8_t alreadyPatched; /* [will be filled] */
FunctionPatcherTargetProcess targetProcess; /* [will be filled] */
} function_replacement_data_t; } function_replacement_data_t;
@ -137,14 +133,9 @@ typedef struct function_replacement_data_t {
physicalAddress, \ physicalAddress, \
effectiveAddress, \ effectiveAddress, \
(uint32_t) my_##x, \ (uint32_t) my_##x, \
(uint32_t) &real_##x, \ (uint32_t *) &real_##x, \
lib, \ lib, \
function_name, \ function_name, \
0, \
{}, \
0, \
FUNCTION_PATCHER_STATIC_FUNCTION, \
0, \
process \ process \
} }

View File

@ -7,11 +7,9 @@
extern "C" { extern "C" {
#endif #endif
extern void FunctionPatcherRestoreDynamicFunctions(function_replacement_data_t *replacements, uint32_t size); extern bool FunctionPatcherPatchFunction(function_replacement_data_t *function_data, PatchedFunctionHandle *outHandle);
extern void FunctionPatcherPatchFunction(function_replacement_data_t *replacements, uint32_t size); extern bool FunctionPatcherRestoreFunction(PatchedFunctionHandle outHandle);
extern void FunctionPatcherRestoreFunctions(function_replacement_data_t *replacements, uint32_t size);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -2,5 +2,4 @@
:TEXT :TEXT
FunctionPatcherPatchFunction FunctionPatcherPatchFunction
FunctionPatcherRestoreFunctions FunctionPatcherRestoreFunction
FunctionPatcherRestoreDynamicFunctions