From dfb88288290796e866ff1d98f9a4e4e40bfd3de3 Mon Sep 17 00:00:00 2001 From: Maschell Date: Fri, 12 Jun 2020 20:51:21 +0200 Subject: [PATCH] Use libfunctionpatcher for non-plugin function patches --- Makefile | 4 +- source/PluginManagement.cpp | 7 +- source/patcher/hooks_patcher.cpp | 12 - source/patcher/hooks_patcher.h | 18 - source/patcher/hooks_patcher_static.cpp | 33 +- source/patcher/hooks_patcher_static.h | 12 +- source/utils/function_patcher.h | 87 ---- source/utils/function_patcher_.cpp | 580 ------------------------ 8 files changed, 18 insertions(+), 735 deletions(-) delete mode 100644 source/patcher/hooks_patcher.cpp delete mode 100644 source/patcher/hooks_patcher.h delete mode 100644 source/utils/function_patcher.h delete mode 100644 source/utils/function_patcher_.cpp diff --git a/Makefile b/Makefile index ec66d5b..b0b0678 100644 --- a/Makefile +++ b/Makefile @@ -41,9 +41,9 @@ CFLAGS += $(INCLUDE) -D__WIIU__ -D__WUT__ CXXFLAGS := $(CFLAGS) -std=c++17 ASFLAGS := -g $(ARCH) -LDFLAGS = -g $(ARCH) $(WUMSSPECS) -Wl,-Map,$(notdir $*.map) +LDFLAGS = -g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) -T$(WUMS_ROOT)/share/libkernel.ld -T$(WUMS_ROOT)/share/libfunctionpatcher.ld $(WUMSSPECS) -LIBS := -lwums -lwut -lwups -lkernel +LIBS := -lwums -lwut -lwups -lkernel -lfunctionpatcher #------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level diff --git a/source/PluginManagement.cpp b/source/PluginManagement.cpp index 8b98831..36d1421 100644 --- a/source/PluginManagement.cpp +++ b/source/PluginManagement.cpp @@ -5,7 +5,6 @@ #include #include #include "patcher/hooks_patcher_static.h" -#include "patcher/hooks_patcher.h" #include "PluginManagement.h" #include "hooks.h" @@ -104,8 +103,7 @@ void PluginManagement::RestorePatches(plugin_information_t *pluginInformation, B new_RestoreInvidualInstructions(&(pluginInformation->plugin_data[plugin_index].info)); } if (!pluginOnly) { - RestoreInvidualInstructions(method_hooks_hooks, method_hooks_size_hooks); - RestoreInvidualInstructions(method_hooks_hooks_static, method_hooks_size_hooks_static); + FunctionPatcherRestoreFunctions(method_hooks_hooks_static, method_hooks_size_hooks_static); } } @@ -165,8 +163,7 @@ void PluginManagement::callInitHooks(plugin_information_t *pluginInformation) { void PluginManagement::PatchFunctionsAndCallHooks(plugin_information_t *gPluginInformation) { DEBUG_FUNCTION_LINE("Patching functions"); - PatchInvidualMethodHooks(method_hooks_hooks_static, method_hooks_size_hooks_static, method_calls_hooks_static); - PatchInvidualMethodHooks(method_hooks_hooks, method_hooks_size_hooks, method_calls_hooks); + FunctionPatcherPatchFunction(method_hooks_hooks_static, method_hooks_size_hooks_static); DCFlushRange((void *) 0x00800000, 0x00800000); ICInvalidateRange((void *) 0x00800000, 0x00800000); diff --git a/source/patcher/hooks_patcher.cpp b/source/patcher/hooks_patcher.cpp deleted file mode 100644 index 543c563..0000000 --- a/source/patcher/hooks_patcher.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include -#include "hooks_patcher.h" - -hooks_magic_t method_hooks_hooks[] __attribute__((section(".data"))) = { -}; - -uint32_t method_hooks_size_hooks __attribute__((section(".data"))) = sizeof(method_hooks_hooks) / sizeof(hooks_magic_t); - -//! buffer to store our instructions needed for our replacements -volatile uint32_t method_calls_hooks[sizeof(method_hooks_hooks) / sizeof(hooks_magic_t) * FUNCTION_PATCHER_METHOD_STORE_SIZE] __attribute__((section(".data"))); - diff --git a/source/patcher/hooks_patcher.h b/source/patcher/hooks_patcher.h deleted file mode 100644 index ffede0b..0000000 --- a/source/patcher/hooks_patcher.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _HOOKS_FUNCTION_PATCHER_H -#define _HOOKS_FUNCTION_PATCHER_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern hooks_magic_t method_hooks_hooks[]; -extern uint32_t method_hooks_size_hooks; -extern volatile uint32_t method_calls_hooks[]; - -#ifdef __cplusplus -} -#endif - -#endif /* _HOOKS_FUNCTION_PATCHER_H */ diff --git a/source/patcher/hooks_patcher_static.cpp b/source/patcher/hooks_patcher_static.cpp index 2be8455..46abd23 100644 --- a/source/patcher/hooks_patcher_static.cpp +++ b/source/patcher/hooks_patcher_static.cpp @@ -1,6 +1,5 @@ #include "utils/logger.h" -#include "utils/function_patcher.h" -#include "hooks_patcher.h" +#include "hooks_patcher_static.h" #include #include #include @@ -11,7 +10,7 @@ extern plugin_information_t *gPluginInformation; -DECL(void, GX2WaitForVsync, void) { +DECL_FUNCTION(void, GX2WaitForVsync, void) { CallHook(gPluginInformation, WUPS_LOADER_HOOK_VSYNC); real_GX2WaitForVsync(); } @@ -58,7 +57,7 @@ void checkMagic(VPADStatus *buffer) { } } -DECL(int32_t, VPADRead, int32_t chan, VPADStatus *buffer, uint32_t buffer_size, int32_t *error) { +DECL_FUNCTION(int32_t, VPADRead, int32_t chan, VPADStatus *buffer, uint32_t buffer_size, int32_t *error) { int32_t result = real_VPADRead(chan, buffer, buffer_size, error); if (result > 0 && (buffer[0].hold == (VPAD_BUTTON_PLUS | VPAD_BUTTON_R | VPAD_BUTTON_L)) && vpadPressCooldown == 0 && OSIsHomeButtonMenuEnabled()) { @@ -249,15 +248,7 @@ DECL_FUNCTION(void, GX2CopyColorBufferToScanBuffer, GX2ColorBuffer* cbuf, int32_ static uint32_t lastData0 = 0; -DECL(uint32_t, OSReceiveMessage, OSMessageQueue *queue, OSMessage *message, uint32_t flags) { - if (flags == 0x15154848) { - CallHook(gPluginInformation, WUPS_LOADER_HOOK_ACQUIRED_FOREGROUND); - CallHook(gPluginInformation, WUPS_LOADER_HOOK_APPLICATION_END); - CallHook(gPluginInformation, WUPS_LOADER_HOOK_FINI_WUT_DEVOPTAB); - //gInBackground = false; - //DCFlushRange(&gInBackground,4); - return false; - } +DECL_FUNCTION(uint32_t, OSReceiveMessage, OSMessageQueue *queue, OSMessage *message, uint32_t flags) { int32_t res = real_OSReceiveMessage(queue, message, flags); if (queue == OSGetSystemMessageQueue()) { if (message != NULL && res) { @@ -278,30 +269,26 @@ DECL(uint32_t, OSReceiveMessage, OSMessageQueue *queue, OSMessage *message, uint return res; } -DECL(void, OSReleaseForeground) { +DECL_FUNCTION(void, OSReleaseForeground) { if (OSGetCoreId() == 1) { CallHook(gPluginInformation, WUPS_LOADER_HOOK_RELEASE_FOREGROUND); } real_OSReleaseForeground(); } -hooks_magic_t method_hooks_hooks_static[] __attribute__((section(".data"))) = { +function_replacement_data_t method_hooks_hooks_static[] __attribute__((section(".data"))) = { //MAKE_MAGIC(GX2SetTVBuffer, LIB_GX2, STATIC_FUNCTION), //MAKE_MAGIC(GX2SetDRCBuffer, LIB_GX2, STATIC_FUNCTION), //MAKE_MAGIC(GX2WaitForVsync, LIB_GX2, STATIC_FUNCTION), //MAKE_MAGIC(GX2CopyColorBufferToScanBuffer, LIB_GX2, STATIC_FUNCTION), //MAKE_MAGIC(GX2SetContextState, LIB_GX2, STATIC_FUNCTION), - MAKE_MAGIC(VPADRead, LIB_VPAD, STATIC_FUNCTION), + REPLACE_FUNCTION(VPADRead, LIBRARY_VPAD, VPADRead), //MAKE_MAGIC(OSIsAddressValid, LIB_CORE_INIT, STATIC_FUNCTION), //MAKE_MAGIC(__OSPhysicalToEffectiveUncached, LIB_CORE_INIT, STATIC_FUNCTION), //MAKE_MAGIC(__OSPhysicalToEffectiveCached, LIB_CORE_INIT, STATIC_FUNCTION), //MAKE_MAGIC(OSEffectiveToPhysical, LIB_CORE_INIT, STATIC_FUNCTION), - MAKE_MAGIC(OSReceiveMessage, LIB_CORE_INIT, STATIC_FUNCTION), - MAKE_MAGIC(OSReleaseForeground, LIB_CORE_INIT, STATIC_FUNCTION) + REPLACE_FUNCTION(OSReceiveMessage, LIBRARY_COREINIT, OSReceiveMessage), + REPLACE_FUNCTION(OSReleaseForeground, LIBRARY_COREINIT, OSReleaseForeground) }; -uint32_t method_hooks_size_hooks_static __attribute__((section(".data"))) = sizeof(method_hooks_hooks_static) / sizeof(hooks_magic_t); - -//! buffer to store our instructions needed for our replacements -volatile uint32_t method_calls_hooks_static[sizeof(method_hooks_hooks_static) / sizeof(hooks_magic_t) * FUNCTION_PATCHER_METHOD_STORE_SIZE] __attribute__((section(".data"))); - +uint32_t method_hooks_size_hooks_static __attribute__((section(".data"))) = sizeof(method_hooks_hooks_static) / sizeof(function_replacement_data_t); \ No newline at end of file diff --git a/source/patcher/hooks_patcher_static.h b/source/patcher/hooks_patcher_static.h index 16ea7ad..c761d1f 100644 --- a/source/patcher/hooks_patcher_static.h +++ b/source/patcher/hooks_patcher_static.h @@ -1,18 +1,14 @@ -#ifndef _HOOKS_STATIC_FUNCTION_PATCHER_H -#define _HOOKS_STATIC_FUNCTION_PATCHER_H +#pragma once -#include +#include #ifdef __cplusplus extern "C" { #endif -extern hooks_magic_t method_hooks_hooks_static[]; +extern function_replacement_data_t method_hooks_hooks_static[]; extern uint32_t method_hooks_size_hooks_static; -extern volatile uint32_t method_calls_hooks_static[]; #ifdef __cplusplus } -#endif - -#endif /* _HOOKS_STATIC_FUNCTION_PATCHER_H */ +#endif \ No newline at end of file diff --git a/source/utils/function_patcher.h b/source/utils/function_patcher.h deleted file mode 100644 index c80a791..0000000 --- a/source/utils/function_patcher.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** - * Copyright (C) 2016-2020 Maschell - * With code from chadderz and dimok - * - * 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 . - ****************************************************************************/ - -#ifndef _FUNCTION_HOOKS_H_ -#define _FUNCTION_HOOKS_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* Macros for libs */ -#define LIB_CORE_INIT 0 -#define LIB_NSYSNET 1 -#define LIB_GX2 2 -#define LIB_AOC 3 -#define LIB_AX 4 -#define LIB_FS 5 -#define LIB_OS 6 -#define LIB_PADSCORE 7 -#define LIB_SOCKET 8 -#define LIB_SYS 9 -#define LIB_VPAD 10 -#define LIB_NN_ACP 11 -#define LIB_SYSHID 12 -#define LIB_VPADBASE 13 -#define LIB_AX_OLD 14 -#define LIB_PROC_UI 15 -#define LIB_NTAG 16 -#define LIB_NFP 17 -#define LIB_SAVE 18 -#define LIB_ACT 19 -#define LIB_NIM 20 - -// functions types -#define STATIC_FUNCTION 0 -#define DYNAMIC_FUNCTION 1 - -//Orignal code by Chadderz. -#define DECL(res, name, ...) \ - res (* real_ ## name)(__VA_ARGS__) __attribute__((section(".data"))); \ - res my_ ## name(__VA_ARGS__) - -#define FUNCTION_PATCHER_METHOD_STORE_SIZE 20 - -typedef struct { - const uint32_t replaceAddr; - const uint32_t replaceCall; - const uint32_t library; - const char functionName[50]; - uint32_t realAddr; - uint32_t restoreInstruction; - uint8_t functionType; - uint8_t alreadyPatched; -} hooks_magic_t; - -void PatchInvidualMethodHooks(hooks_magic_t hook_information[], int32_t hook_information_size, volatile uint32_t dynamic_method_calls[]); -void RestoreInvidualInstructions(hooks_magic_t hook_information[], int32_t hook_information_size); -uint32_t GetAddressOfFunction(const char *functionName, uint32_t library); -int32_t isDynamicFunction(uint32_t physicalAddress); -void resetLibs(); - -//Orignal code by Chadderz. -#define MAKE_MAGIC(x, lib, functionType) { (uint32_t) my_ ## x, (uint32_t) &real_ ## x, lib, # x,0,0,functionType,0} -#define MAKE_MAGIC_NAME(x, y, lib, functionType) { (uint32_t) my_ ## x, (uint32_t) &real_ ## x, lib, # y,0,0,functionType,0} - -#ifdef __cplusplus -} -#endif - -#endif /* _FS_H */ diff --git a/source/utils/function_patcher_.cpp b/source/utils/function_patcher_.cpp deleted file mode 100644 index a7403b6..0000000 --- a/source/utils/function_patcher_.cpp +++ /dev/null @@ -1,580 +0,0 @@ -/**************************************************************************** - * Copyright (C) 2016 Maschell - * With code from chadderz and dimok - * - * 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 . - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include "function_patcher.h" -#include "logger.h" - -#define LIB_CODE_RW_BASE_OFFSET 0xC1000000 -#define CODE_RW_BASE_OFFSET 0x00000000 -#define DEBUG_LOG_DYN 0 - -OSDynLoad_Module acp_handle_internal = 0; -OSDynLoad_Module aoc_handle_internal = 0; -OSDynLoad_Module sound_handle_internal = 0; -OSDynLoad_Module sound_handle_internal_old = 0; -OSDynLoad_Module libcurl_handle_internal = 0; -OSDynLoad_Module gx2_handle_internal = 0; -OSDynLoad_Module nfp_handle_internal = 0; -OSDynLoad_Module nn_act_handle_internal = 0; -OSDynLoad_Module nn_nim_handle_internal = 0; -OSDynLoad_Module nn_save_handle_internal = 0; -OSDynLoad_Module ntag_handle_internal = 0; -OSDynLoad_Module coreinit_handle_internal = 0; -OSDynLoad_Module padscore_handle_internal = 0; -OSDynLoad_Module proc_ui_handle_internal = 0; -OSDynLoad_Module nsysnet_handle_internal = 0; -OSDynLoad_Module sysapp_handle_internal = 0; -OSDynLoad_Module syshid_handle_internal = 0; -OSDynLoad_Module vpad_handle_internal = 0; -OSDynLoad_Module vpadbase_handle_internal = 0; - -/* -* Patches a function that is loaded at the start of each application. Its not required to restore, at least when they are really dynamic. -* "normal" functions should be patch with the normal patcher. Current Code by Maschell with the help of dimok. Orignal code by Chadderz. -*/ -void PatchInvidualMethodHooks(hooks_magic_t method_hooks[], int32_t hook_information_size, volatile uint32_t dynamic_method_calls[]) { - resetLibs(); - - DEBUG_FUNCTION_LINE("Patching %d given functions", hook_information_size); - /* Patch branches to it. */ - volatile uint32_t *space = &dynamic_method_calls[0]; - - int32_t method_hooks_count = hook_information_size; - - uint32_t skip_instr = 1; - uint32_t my_instr_len = 4; - uint32_t instr_len = my_instr_len + skip_instr + 16; - uint32_t flush_len = 4 * instr_len; - for (int32_t i = 0; i < method_hooks_count; i++) { - DEBUG_FUNCTION_LINE_WRITE("Patching %s ...", method_hooks[i].functionName); - if (method_hooks[i].functionType == STATIC_FUNCTION && method_hooks[i].alreadyPatched == 1) { - if (isDynamicFunction((uint32_t) OSEffectiveToPhysical(method_hooks[i].realAddr))) { - WHBLogWritef("The function %s is a dynamic function. Please fix that <3", method_hooks[i].functionName); - method_hooks[i].functionType = DYNAMIC_FUNCTION; - } else { - WHBLogPrintf("Skipping %s, its already patched", method_hooks[i].functionName); - space += instr_len; - continue; - } - } - - uint32_t physical = 0; - uint32_t repl_addr = (uint32_t) method_hooks[i].replaceAddr; - uint32_t call_addr = (uint32_t) method_hooks[i].replaceCall; - - uint32_t real_addr = GetAddressOfFunction(method_hooks[i].functionName, method_hooks[i].library); - - if (!real_addr) { - WHBLogWritef("\n"); - DEBUG_FUNCTION_LINE("OSDynLoad_FindExport failed for %s", method_hooks[i].functionName); - space += instr_len; - continue; - } - - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("%s is located at %08X!", method_hooks[i].functionName, real_addr); - } - - physical = (uint32_t) OSEffectiveToPhysical(real_addr); - if (!physical) { - WHBLogWritef("Error. Something is wrong with the physical address\n"); - space += instr_len; - continue; - } - - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("%s physical is located at %08X!", method_hooks[i].functionName, physical); - } - - *(volatile uint32_t *) (call_addr) = (uint32_t) (space) - CODE_RW_BASE_OFFSET; - - uint32_t targetAddr = (uint32_t) space; - if (targetAddr < 0x00800000 || targetAddr >= 0x01000000) { - targetAddr = (uint32_t) OSEffectiveToPhysical(targetAddr); - } else { - targetAddr = targetAddr + 0x30800000 - 0x00800000; - } - - KernelCopyData(targetAddr, physical, 4); - - ICInvalidateRange((void *) (space), 4); - DCFlushRange((void *) (space), 4); - space++; - - //Only works if skip_instr == 1 - if (skip_instr == 1) { - // fill the restore instruction section - method_hooks[i].realAddr = real_addr; - method_hooks[i].restoreInstruction = *(space - 1); - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("method_hooks[i].realAddr = %08X!", method_hooks[i].realAddr); - } - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("method_hooks[i].restoreInstruction = %08X!", method_hooks[i].restoreInstruction); - } - } else { - WHBLogWritef("Error. Can't save %s for restoring!\n", method_hooks[i].functionName); - } - - /* - 00808cfc 3d601234 lis r11 ,0x1234 - 00808d00 616b5678 ori r11 ,r11 ,0x5678 - 00808d04 7d6903a6 mtspr CTR ,r11 - 00808d08 4e800420 bctr - */ - uint32_t ptr = (uint32_t)space; - *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 = 0x4e800420; space++; - - // Only use patched function if OSGetUPID is 2 (wii u menu) or 15 (game) - uint32_t repl_addr_test = (uint32_t) space; - *space = 0x3d600000 | (((uint32_t*) OSGetUPID)[0] & 0x0000FFFF); space++; // lis r11 ,0x0 - *space = 0x816b0000 | (((uint32_t*) OSGetUPID)[1] & 0x0000FFFF); space++; // lwz r11 ,0x0(r11) - *space = 0x2c0b0000 | 0x00000002; space++; // cmpwi r11 ,0x2 - *space = 0x41820000 | 0x00000020; space++; // beq myfunc - *space = 0x2c0b0000 | 0x0000000F; space++; // cmpwi r11 ,0xF - *space = 0x41820000 | 0x00000018; space++; // beq myfunc - *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 - uint32_t replace_instr = 0x48000002 | (repl_addr_test & 0x03fffffc); - ICInvalidateRange(&replace_instr, 4); - DCFlushRange(&replace_instr, 4); - - KernelCopyData(physical, (uint32_t) OSEffectiveToPhysical((uint32_t) &replace_instr), 4); - ICInvalidateRange((void *) (real_addr), 4); - - method_hooks[i].alreadyPatched = 1; - WHBLogWritef("done!\n"); - - } - DEBUG_FUNCTION_LINE("Done with patching given functions!"); -} - -/* ****************************************************************** */ -/* RESTORE ORIGINAL INSTRUCTIONS */ -/* ****************************************************************** */ -void RestoreInvidualInstructions(hooks_magic_t method_hooks[], int32_t hook_information_size) { - resetLibs(); - DEBUG_FUNCTION_LINE("Restoring given functions!"); - int32_t method_hooks_count = hook_information_size; - for (int32_t i = 0; i < method_hooks_count; i++) { - DEBUG_FUNCTION_LINE("Restoring %s... ", method_hooks[i].functionName); - if (method_hooks[i].restoreInstruction == 0 || method_hooks[i].realAddr == 0) { - WHBLogWritef("I dont have the information for the restore =( skip\n"); - continue; - } - - uint32_t real_addr = GetAddressOfFunction(method_hooks[i].functionName, method_hooks[i].library); - - if (!real_addr) { - WHBLogWritef("OSDynLoad_FindExport failed for %s", method_hooks[i].functionName); - continue; - } - - uint32_t physical = (uint32_t) OSEffectiveToPhysical(real_addr); - if (!physical) { - WHBLogWritef("Something is wrong with the physical address\n"); - continue; - } - - if (isDynamicFunction(physical)) { - WHBLogWritef("Its a dynamic function. We don't need to restore it!\n", method_hooks[i].functionName); - } else { - physical = (uint32_t) OSEffectiveToPhysical(method_hooks[i].realAddr); //When its an static function, we need to use the old location - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("Restoring %08X to %08X", (uint32_t) method_hooks[i].restoreInstruction, physical); - } - uint32_t targetAddr = (uint32_t) &method_hooks[i].restoreInstruction; - if (targetAddr < 0x00800000 || targetAddr >= 0x01000000) { - targetAddr = (uint32_t) OSEffectiveToPhysical(targetAddr); - } else { - targetAddr = targetAddr + 0x30800000 - 0x00800000; - } - - KernelCopyData(physical, targetAddr, 4); - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("ICInvalidateRange %08X", (void *) method_hooks[i].realAddr); - } - ICInvalidateRange((void *) method_hooks[i].realAddr, 4); - WHBLogWritef("done\n"); - } - method_hooks[i].alreadyPatched = 0; // In case a - } - - DEBUG_FUNCTION_LINE("Done with restoring given functions!"); -} - -int32_t isDynamicFunction(uint32_t physicalAddress) { - if ((physicalAddress & 0x80000000) == 0x80000000) { - return 1; - } - return 0; -} - -uint32_t GetAddressOfFunction(const char *functionName, uint32_t library) { - uint32_t real_addr = 0; - - /* - if(strcmp(functionName, "OSDynLoad_Acquire") == 0) { - memcpy(&real_addr, &OSDynLoad_Acquire, 4); - return real_addr; - } else if(strcmp(functionName, "LiWaitOneChunk") == 0) { - real_addr = (uint32_t)addr_LiWaitOneChunk; - return real_addr; - } else if(strcmp(functionName, "LiBounceOneChunk") == 0) { - //! not required on firmwares above 3.1.0 - if(OS_FIRMWARE >= 400) - return 0; - - uint32_t addr_LiBounceOneChunk = 0x010003A0; - real_addr = (uint32_t)addr_LiBounceOneChunk; - return real_addr; - } - */ - - OSDynLoad_Module rpl_handle = 0; - if (library == LIB_CORE_INIT) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_CORE_INIT", functionName); - } - if (coreinit_handle_internal == 0) { - OSDynLoad_Acquire("coreinit.rpl", &coreinit_handle_internal); - } - if (coreinit_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_CORE_INIT failed to acquire"); - return 0; - } - rpl_handle = coreinit_handle_internal; - } else if (library == LIB_NSYSNET) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_NSYSNET", functionName); - } - if (nsysnet_handle_internal == 0) { - OSDynLoad_Acquire("nsysnet.rpl", &nsysnet_handle_internal); - } - if (nsysnet_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_NSYSNET failed to acquire"); - return 0; - } - rpl_handle = nsysnet_handle_internal; - } else if (library == LIB_GX2) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_GX2", functionName); - } - if (gx2_handle_internal == 0) { - OSDynLoad_Acquire("gx2.rpl", &gx2_handle_internal); - } - if (gx2_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_GX2 failed to acquire"); - return 0; - } - rpl_handle = gx2_handle_internal; - } else if (library == LIB_AOC) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_AOC", functionName); - } - if (aoc_handle_internal == 0) { - OSDynLoad_Acquire("nn_aoc.rpl", &aoc_handle_internal); - } - if (aoc_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_AOC failed to acquire"); - return 0; - } - rpl_handle = aoc_handle_internal; - } else if (library == LIB_AX) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_AX", functionName); - } - if (sound_handle_internal == 0) { - OSDynLoad_Acquire("sndcore2.rpl", &sound_handle_internal); - } - if (sound_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_AX failed to acquire"); - return 0; - } - rpl_handle = sound_handle_internal; - } else if (library == LIB_AX_OLD) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_AX_OLD", functionName); - } - if (sound_handle_internal_old == 0) { - OSDynLoad_Acquire("snd_core.rpl", &sound_handle_internal_old); - } - if (sound_handle_internal_old == 0) { - DEBUG_FUNCTION_LINE("LIB_AX_OLD failed to acquire"); - return 0; - } - rpl_handle = sound_handle_internal_old; - } else if (library == LIB_FS) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_FS", functionName); - } - if (coreinit_handle_internal == 0) { - OSDynLoad_Acquire("coreinit.rpl", &coreinit_handle_internal); - } - if (coreinit_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_FS failed to acquire"); - return 0; - } - rpl_handle = coreinit_handle_internal; - } else if (library == LIB_OS) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_OS", functionName); - } - if (coreinit_handle_internal == 0) { - OSDynLoad_Acquire("coreinit.rpl", &coreinit_handle_internal); - } - if (coreinit_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_OS failed to acquire"); - return 0; - } - rpl_handle = coreinit_handle_internal; - } else if (library == LIB_PADSCORE) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_PADSCORE", functionName); - } - if (padscore_handle_internal == 0) { - OSDynLoad_Acquire("padscore.rpl", &padscore_handle_internal); - } - if (padscore_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_PADSCORE failed to acquire"); - return 0; - } - rpl_handle = padscore_handle_internal; - } else if (library == LIB_SOCKET) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_SOCKET", functionName); - } - if (nsysnet_handle_internal == 0) { - OSDynLoad_Acquire("nsysnet.rpl", &nsysnet_handle_internal); - } - if (nsysnet_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_SOCKET failed to acquire"); - return 0; - } - rpl_handle = nsysnet_handle_internal; - } else if (library == LIB_SYS) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_SYS", functionName); - } - if (sysapp_handle_internal == 0) { - OSDynLoad_Acquire("sysapp.rpl", &sysapp_handle_internal); - } - if (sysapp_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_SYS failed to acquire"); - return 0; - } - rpl_handle = sysapp_handle_internal; - } else if (library == LIB_VPAD) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_VPAD", functionName); - } - if (vpad_handle_internal == 0) { - OSDynLoad_Acquire("vpad.rpl", &vpad_handle_internal); - } - if (vpad_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_VPAD failed to acquire"); - return 0; - } - rpl_handle = vpad_handle_internal; - } else if (library == LIB_NN_ACP) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_NN_ACP", functionName); - } - if (acp_handle_internal == 0) { - OSDynLoad_Acquire("nn_acp.rpl", &acp_handle_internal); - } - if (acp_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_NN_ACP failed to acquire"); - return 0; - } - rpl_handle = acp_handle_internal; - } else if (library == LIB_SYSHID) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_SYSHID", functionName); - } - if (syshid_handle_internal == 0) { - OSDynLoad_Acquire("nsyshid.rpl", &syshid_handle_internal); - } - if (syshid_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_SYSHID failed to acquire"); - return 0; - } - rpl_handle = syshid_handle_internal; - } else if (library == LIB_VPADBASE) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_VPADBASE", functionName); - } - if (vpadbase_handle_internal == 0) { - OSDynLoad_Acquire("vpadbase.rpl", &vpadbase_handle_internal); - } - if (vpadbase_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_VPADBASE failed to acquire"); - return 0; - } - rpl_handle = vpadbase_handle_internal; - } else if (library == LIB_PROC_UI) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_PROC_UI", functionName); - } - if (proc_ui_handle_internal == 0) { - OSDynLoad_Acquire("proc_ui.rpl", &proc_ui_handle_internal); - } - if (proc_ui_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_PROC_UI failed to acquire"); - return 0; - } - rpl_handle = proc_ui_handle_internal; - } else if (library == LIB_NTAG) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_NTAG", functionName); - } - if (ntag_handle_internal == 0) { - OSDynLoad_Acquire("ntag.rpl", &ntag_handle_internal); - } - if (ntag_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_NTAG failed to acquire"); - return 0; - } - rpl_handle = ntag_handle_internal; - } else if (library == LIB_NFP) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_NFP", functionName); - } - if (nfp_handle_internal == 0) { - OSDynLoad_Acquire("nn_nfp.rpl", &nfp_handle_internal); - } - if (nfp_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_NFP failed to acquire"); - return 0; - } - rpl_handle = nfp_handle_internal; - } else if (library == LIB_SAVE) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_SAVE", functionName); - } - if (nn_save_handle_internal == 0) { - OSDynLoad_Acquire("nn_save.rpl", &nn_save_handle_internal); - } - if (nn_save_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_SAVE failed to acquire"); - return 0; - } - rpl_handle = nn_save_handle_internal; - } else if (library == LIB_ACT) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_ACT", functionName); - } - if (nn_act_handle_internal == 0) { - OSDynLoad_Acquire("nn_act.rpl", &nn_act_handle_internal); - } - if (nn_act_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_ACT failed to acquire"); - return 0; - } - rpl_handle = nn_act_handle_internal; - } else if (library == LIB_NIM) { - if (DEBUG_LOG_DYN) { - DEBUG_FUNCTION_LINE("FindExport of %s! From LIB_NIM", functionName); - } - if (nn_nim_handle_internal == 0) { - OSDynLoad_Acquire("nn_nim.rpl", &nn_nim_handle_internal); - } - if (nn_nim_handle_internal == 0) { - DEBUG_FUNCTION_LINE("LIB_NIM failed to acquire"); - return 0; - } - rpl_handle = nn_nim_handle_internal; - } - - if (!rpl_handle) { - DEBUG_FUNCTION_LINE("Failed to find the RPL handle for %s", functionName); - return 0; - } - - OSDynLoad_FindExport(rpl_handle, 0, functionName, (void **) &real_addr); - - if (!real_addr) { - OSDynLoad_FindExport(rpl_handle, 1, functionName, (void **) &real_addr); - if (!real_addr) { - DEBUG_FUNCTION_LINE("OSDynLoad_FindExport failed for %s", functionName); - return 0; - } - } - - if ((library == LIB_NN_ACP) && (uint32_t) (*(volatile uint32_t *) (real_addr) & 0x48000002) == 0x48000000) { - uint32_t address_diff = (uint32_t) (*(volatile uint32_t *) (real_addr) & 0x03FFFFFC); - if ((address_diff & 0x03000000) == 0x03000000) { - address_diff |= 0xFC000000; - } - real_addr += (int32_t) address_diff; - if ((uint32_t) (*(volatile uint32_t *) (real_addr) & 0x48000002) == 0x48000000) { - return 0; - } - } - - return real_addr; -} - -void resetLibs() { - acp_handle_internal = 0; - aoc_handle_internal = 0; - sound_handle_internal = 0; - sound_handle_internal_old = 0; - libcurl_handle_internal = 0; - gx2_handle_internal = 0; - nfp_handle_internal = 0; - nn_act_handle_internal = 0; - nn_nim_handle_internal = 0; - nn_save_handle_internal = 0; - ntag_handle_internal = 0; - coreinit_handle_internal = 0; - padscore_handle_internal = 0; - proc_ui_handle_internal = 0; - nsysnet_handle_internal = 0; - sysapp_handle_internal = 0; - syshid_handle_internal = 0; - vpad_handle_internal = 0; - vpadbase_handle_internal = 0; -}