The-Homebrew-Cloud/WiiUPluginLoaderBackend
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2024-11-05 12:35:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure to use plugins only in proccess 2 and 15.

Browse Source
This commit is contained in:
Maschell 2020-05-28 20:49:52 +02:00
parent bbd2d2a4f1
commit 80a0712519
5 changed files with 75 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/common/replacement_defines.h
View File

@ -3,7 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <wups.h> #include <wups.h>
#define FUNCTION_PATCHER_METHOD_STORE_SIZE 13 #define FUNCTION_PATCHER_METHOD_STORE_SIZE 20
#define MAXIMUM_FUNCTION_NAME_LENGTH 83 #define MAXIMUM_FUNCTION_NAME_LENGTH 83
struct replacement_data_function_t { struct replacement_data_function_t {

7
source/main.cpp
View File

@ -3,6 +3,7 @@
#include <whb/log_udp.h> #include <whb/log_udp.h>
#include <exception> #include <exception>
#include <sysapp/launch.h> #include <sysapp/launch.h>
#include <coreinit/debug.h>
#include <coreinit/memexpheap.h> #include <coreinit/memexpheap.h>
#include <coreinit/dynload.h> #include <coreinit/dynload.h>
#include <coreinit/cache.h> #include <coreinit/cache.h>
@ -43,10 +44,12 @@ int main(int argc, char **argv) {
int test() { int test() {
WHBLogUdpInit(); WHBLogUdpInit();
uint32_t upid = OSGetUPID();
if (upid != 2 && upid != 15) {
return 0;
}
bool initNeeded = false; bool initNeeded = false;
if (pluginDataHeap == NULL) { if (pluginDataHeap == NULL) {
kernelInitialize();
DEBUG_FUNCTION_LINE("Kernel init done");
DCFlushRange((void *) 0x00880000, sizeof(module_information_t)); DCFlushRange((void *) 0x00880000, sizeof(module_information_t));
uint32_t endAddress = 0; uint32_t endAddress = 0;
DEBUG_FUNCTION_LINE("Using %d modules", gModuleData->number_used_modules); DEBUG_FUNCTION_LINE("Using %d modules", gModuleData->number_used_modules);

65
source/patcher/function_patcher.cpp
View File

@ -22,6 +22,7 @@
#include <malloc.h> #include <malloc.h>
#include <string.h> #include <string.h>
#include <wups.h> #include <wups.h>
#include <coreinit/debug.h>
#include "function_patcher.h" #include "function_patcher.h"
#include <utils/logger.h> #include <utils/logger.h>
@ -112,8 +113,8 @@ void new_PatchInvidualMethodHooks(plugin_info_t *plugin_data) {
int32_t method_hooks_count = plugin_data->number_used_functions; int32_t method_hooks_count = plugin_data->number_used_functions;
uint32_t skip_instr = 1; uint32_t skip_instr = 1;
uint32_t my_instr_len = 6; uint32_t my_instr_len = 4;
uint32_t instr_len = my_instr_len + skip_instr + 6; uint32_t instr_len = my_instr_len + skip_instr + 15;
uint32_t flush_len = 4 * instr_len; uint32_t flush_len = 4 * instr_len;
for (int32_t i = 0; i < method_hooks_count; i++) { for (int32_t i = 0; i < method_hooks_count; i++) {
replacement_data_function_t *function_data = &plugin_data->functions[i]; replacement_data_function_t *function_data = &plugin_data->functions[i];
@ -203,41 +204,37 @@ void new_PatchInvidualMethodHooks(plugin_info_t *plugin_data) {
WHBLogWritef("Error. Can't save %s for restoring!\n", function_data->function_name); WHBLogWritef("Error. Can't save %s for restoring!\n", function_data->function_name);
} }
//adding jump to real function thx @ dimok for the assembler code
/* /*
90 61 ff e0 stw r3,-32(r1) 00808cfc 3d601234 lis r11 ,0x1234
3c 60 12 34 lis r3,4660 00808d00 616b5678 ori r11 ,r11 ,0x5678
60 63 56 78 ori r3,r3,22136 00808d04 7d6903a6 mtspr CTR ,r11
7c 69 03 a6 mtctr r3 00808d08 4e800420 bctr
80 61 ff e0 lwz r3,-32(r1) */
4e 80 04 20 bctr*/ uint32_t ptr = (uint32_t)space;
*space = 0x9061FFE0; *space = 0x3d600000 | (((real_addr + (skip_instr * 4)) >> 16) & 0x0000FFFF); space++; // lis r11 ,0x1234
space++; *space = 0x616b0000 | ((real_addr + (skip_instr * 4)) & 0x0000ffff); space++; // ori r11 ,r11 ,0x5678
*space = 0x3C600000 | (((real_addr + (skip_instr * 4)) >> 16) & 0x0000FFFF); // lis r3, real_addr@h *space = 0x7d6903a6; space++; // mtspr CTR ,r11
space++; *space = 0x4e800420; space++;
*space = 0x60630000 | ((real_addr + (skip_instr * 4)) & 0x0000ffff); // ori r3, r3, real_addr@l
space++;
*space = 0x7C6903A6; // mtctr r3
space++;
*space = 0x8061FFE0; // lwz r3,-32(r1)
space++;
*space = 0x4E800420; // bctr
space++;
// Only use patched function if OSGetUPID is 2 (wii u menu) or 15 (game)
uint32_t repl_addr_test = (uint32_t) space; uint32_t repl_addr_test = (uint32_t) space;
*space = 0x9061FFE0; *space = 0x3d600000 | (((uint32_t*) OSGetUPID)[0] & 0x0000FFFF); space++; // lis r11 ,0x0
space++; *space = 0x816b0000 | (((uint32_t*) OSGetUPID)[1] & 0x0000FFFF); space++; // lwz r11 ,0x0(r11)
*space = 0x3C600000 | (((repl_addr) >> 16) & 0x0000FFFF); // lis r3, repl_addr@h *space = 0x2c0b0000 | 0x00000002; space++; // cmpwi r11 ,0x2
space++; *space = 0x41820000 | 0x00000020; space++; // beq myfunc
*space = 0x60630000 | ((repl_addr) & 0x0000ffff); // ori r3, r3, repl_addr@l *space = 0x2c0b0000 | 0x0000000F; space++; // cmpwi r11 ,0xF
space++; *space = 0x41820000 | 0x00000018; space++; // beq myfunc
*space = 0x7C6903A6; // mtctr r3 *space = 0x3d600000 | (((real_addr + (skip_instr * 4)) >> 16) & 0x0000FFFF); space++; // lis r11 ,0x1234
space++; *space = 0x616b0000 | ((real_addr + (skip_instr * 4)) & 0x0000ffff); space++; // ori r11 ,r11 ,0x5678
*space = 0x8061FFE0; // lwz r3,-32(r1) *space = 0x7d6903a6; space++; // mtspr CTR ,r11
space++; *space = function_data->restoreInstruction; space++; //
*space = 0x4E800420; // bctr *space = 0x4e800420; space++; // bctr
space++; // myfunc:
*space = 0x3d600000 | (((repl_addr) >> 16) & 0x0000FFFF); space++; // lis r11 ,0x1234
*space = 0x616b0000 | ((repl_addr) & 0x0000ffff); space++; // ori r11 ,r11 ,0x5678
*space = 0x7d6903a6; space++; // mtspr CTR ,r11
*space = 0x4e800420; space++; // bctr
DCFlushRange((void *) (((uint32_t) space) - flush_len), flush_len); DCFlushRange((void *) (((uint32_t) space) - flush_len), flush_len);
ICInvalidateRange((void *) (((uint32_t) space) - flush_len), flush_len); ICInvalidateRange((void *) (((uint32_t) space) - flush_len), flush_len);

2
source/utils/function_patcher.h
View File

@ -57,7 +57,7 @@ extern "C" {
res (* real_ ## name)(__VA_ARGS__) __attribute__((section(".data"))); \ res (* real_ ## name)(__VA_ARGS__) __attribute__((section(".data"))); \
res my_ ## name(__VA_ARGS__) res my_ ## name(__VA_ARGS__)
#define FUNCTION_PATCHER_METHOD_STORE_SIZE 7 #define FUNCTION_PATCHER_METHOD_STORE_SIZE 20
typedef struct { typedef struct {
const uint32_t replaceAddr; const uint32_t replaceAddr;

62
source/utils/function_patcher_.cpp
View File

@ -24,6 +24,7 @@
#include <coreinit/memorymap.h> #include <coreinit/memorymap.h>
#include <coreinit/cache.h> #include <coreinit/cache.h>
#include <coreinit/dynload.h> #include <coreinit/dynload.h>
#include <coreinit/debug.h>
#include "kernel/kernel_utils.h" #include "kernel/kernel_utils.h"
#include "function_patcher.h" #include "function_patcher.h"
@ -67,8 +68,8 @@ void PatchInvidualMethodHooks(hooks_magic_t method_hooks[], int32_t hook_informa
int32_t method_hooks_count = hook_information_size; int32_t method_hooks_count = hook_information_size;
uint32_t skip_instr = 1; uint32_t skip_instr = 1;
uint32_t my_instr_len = 6; uint32_t my_instr_len = 4;
uint32_t instr_len = my_instr_len + skip_instr; uint32_t instr_len = my_instr_len + skip_instr + 16;
uint32_t flush_len = 4 * instr_len; uint32_t flush_len = 4 * instr_len;
for (int32_t i = 0; i < method_hooks_count; i++) { for (int32_t i = 0; i < method_hooks_count; i++) {
DEBUG_FUNCTION_LINE_WRITE("Patching %s ...", method_hooks[i].functionName); DEBUG_FUNCTION_LINE_WRITE("Patching %s ...", method_hooks[i].functionName);
@ -113,7 +114,6 @@ void PatchInvidualMethodHooks(hooks_magic_t method_hooks[], int32_t hook_informa
*(volatile uint32_t *) (call_addr) = (uint32_t) (space) - CODE_RW_BASE_OFFSET; *(volatile uint32_t *) (call_addr) = (uint32_t) (space) - CODE_RW_BASE_OFFSET;
uint32_t targetAddr = (uint32_t) space; uint32_t targetAddr = (uint32_t) space;
if (targetAddr < 0x00800000 || targetAddr >= 0x01000000) { if (targetAddr < 0x00800000 || targetAddr >= 0x01000000) {
targetAddr = (uint32_t) OSEffectiveToPhysical(targetAddr); targetAddr = (uint32_t) OSEffectiveToPhysical(targetAddr);
@ -142,31 +142,43 @@ void PatchInvidualMethodHooks(hooks_magic_t method_hooks[], int32_t hook_informa
WHBLogWritef("Error. Can't save %s for restoring!\n", method_hooks[i].functionName); WHBLogWritef("Error. Can't save %s for restoring!\n", method_hooks[i].functionName);
} }
//adding jump to real function thx @ dimok for the assembler code
/* /*
90 61 ff e0 stw r3,-32(r1) 00808cfc 3d601234 lis r11 ,0x1234
3c 60 12 34 lis r3,4660 00808d00 616b5678 ori r11 ,r11 ,0x5678
60 63 56 78 ori r3,r3,22136 00808d04 7d6903a6 mtspr CTR ,r11
7c 69 03 a6 mtctr r3 00808d08 4e800420 bctr
80 61 ff e0 lwz r3,-32(r1) */
4e 80 04 20 bctr*/ uint32_t ptr = (uint32_t)space;
*space = 0x9061FFE0; *space = 0x3d600000 | (((real_addr + (skip_instr * 4)) >> 16) & 0x0000FFFF); space++; // lis r11 ,0x1234
space++; *space = 0x616b0000 | ((real_addr + (skip_instr * 4)) & 0x0000ffff); space++; // ori r11 ,r11 ,0x5678
*space = 0x3C600000 | (((real_addr + (skip_instr * 4)) >> 16) & 0x0000FFFF); // lis r3, real_addr@h *space = 0x7d6903a6; space++; // mtspr CTR ,r11
space++; *space = 0x4e800420; space++;
*space = 0x60630000 | ((real_addr + (skip_instr * 4)) & 0x0000ffff); // ori r3, r3, real_addr@l
space++; // Only use patched function if OSGetUPID is 2 (wii u menu) or 15 (game)
*space = 0x7C6903A6; // mtctr r3 uint32_t repl_addr_test = (uint32_t) space;
space++; *space = 0x3d600000 | (((uint32_t*) OSGetUPID)[0] & 0x0000FFFF); space++; // lis r11 ,0x0
*space = 0x8061FFE0; // lwz r3,-32(r1) *space = 0x816b0000 | (((uint32_t*) OSGetUPID)[1] & 0x0000FFFF); space++; // lwz r11 ,0x0(r11)
space++; *space = 0x2c0b0000 | 0x00000002; space++; // cmpwi r11 ,0x2
*space = 0x4E800420; // bctr *space = 0x41820000 | 0x00000020; space++; // beq myfunc
space++; *space = 0x2c0b0000 | 0x0000000F; space++; // cmpwi r11 ,0xF
DCFlushRange((void *) (space - instr_len), flush_len); *space = 0x41820000 | 0x00000018; space++; // beq myfunc
ICInvalidateRange((unsigned char *) (space - instr_len), flush_len); *space = 0x3d600000 | (((real_addr + (skip_instr * 4)) >> 16) & 0x0000FFFF); space++; // lis r11 ,0x1234
*space = 0x616b0000 | ((real_addr + (skip_instr * 4)) & 0x0000ffff); space++; // ori r11 ,r11 ,0x5678
*space = 0x7d6903a6; space++; // mtspr CTR ,r11
*space = method_hooks[i].restoreInstruction; space++;
*space = 0x4e800420; space++; // bctr
// myfunc:
*space = 0x3d600000 | (((repl_addr) >> 16) & 0x0000FFFF); space++; // lis r11 ,0x1234
*space = 0x616b0000 | ((repl_addr) & 0x0000ffff); space++; // ori r11 ,r11 ,0x5678
*space = 0x7d6903a6; space++; // mtspr CTR ,r11
*space = 0x4e800420; space++; // bctr
DCFlushRange((void *) (((uint32_t) space) - flush_len), flush_len);
ICInvalidateRange((void *) (((uint32_t) space) - flush_len), flush_len);
//setting jump back //setting jump back
uint32_t replace_instr = 0x48000002 | (repl_addr & 0x03fffffc); uint32_t replace_instr = 0x48000002 | (repl_addr_test & 0x03fffffc);
ICInvalidateRange(&replace_instr, 4);
DCFlushRange(&replace_instr, 4); DCFlushRange(&replace_instr, 4);
KernelCopyData(physical, (uint32_t) OSEffectiveToPhysical((uint32_t) &replace_instr), 4); KernelCopyData(physical, (uint32_t) OSEffectiveToPhysical((uint32_t) &replace_instr), 4);