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

Move logging into a separate file

Browse Source
This commit is contained in:
Maschell 2022-01-26 13:42:15 +01:00
parent 1975c8b896
commit 8f3d0dc8cd
3 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/logger.c Normal file
View File

@ -0,0 +1,36 @@
#ifdef DEBUG
#include <stdint.h>
#include <whb/log_udp.h>
#include <whb/log_cafe.h>
#include <whb/log_module.h>
uint32_t moduleLogInit = false;
uint32_t cafeLogInit = false;
uint32_t udpLogInit = false;
#endif // DEBUG
void initLogging() {
#ifdef DEBUG
if (!(moduleLogInit = WHBLogModuleInit())) {
cafeLogInit = WHBLogCafeInit();
udpLogInit = WHBLogUdpInit();
}
#endif // DEBUG
}
void deinitLogging() {
#ifdef DEBUG
if (moduleLogInit) {
WHBLogModuleDeinit();
moduleLogInit = false;
}
if (cafeLogInit) {
WHBLogCafeDeinit();
cafeLogInit = false;
}
if (udpLogInit) {
WHBLogUdpDeinit();
udpLogInit = false;
}
#endif // DEBUG
}

4
source/logger.h
View File

@ -32,6 +32,10 @@ extern "C" {
#endif #endif
void initLogging();
void deinitLogging();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

32
source/main.cpp
View File

@ -1,11 +1,5 @@
#include <wums.h> #include <wums.h>
#ifdef DEBUG
#include <whb/log_cafe.h>
#include <whb/log_udp.h>
#include <whb/log_module.h>
#endif // DEBUG
#include <coreinit/debug.h> #include <coreinit/debug.h>
#include <cstring> #include <cstring>
#include <coreinit/cache.h> #include <coreinit/cache.h>
@ -19,10 +13,6 @@ WUMS_MODULE_SKIP_INIT_FINI();
bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length, bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length,
RelocationType reloc_type); RelocationType reloc_type);
uint32_t moduleLogInit = false;
uint32_t cafeLogInit = false;
uint32_t udpLogInit = false;
WUMS_RELOCATIONS_DONE(args) { WUMS_RELOCATIONS_DONE(args) {
module_information_t *gModuleData = args.module_information; module_information_t *gModuleData = args.module_information;
if (args.module_information == nullptr) { if (args.module_information == nullptr) {
@ -32,12 +22,7 @@ WUMS_RELOCATIONS_DONE(args) {
OSFatal("PatchMemoryRelocations: The module information struct version does not match."); OSFatal("PatchMemoryRelocations: The module information struct version does not match.");
} }
#ifdef DEBUG initLogging();
if (!(moduleLogInit = WHBLogModuleInit())) {
cafeLogInit = WHBLogCafeInit();
udpLogInit = WHBLogUdpInit();
}
#endif // DEBUG
for (int32_t i = 0; i < gModuleData->number_used_modules; i++) { for (int32_t i = 0; i < gModuleData->number_used_modules; i++) {
if (strcmp("homebrew_memorymapping", gModuleData->module_data[i].module_export_name) == 0 || if (strcmp("homebrew_memorymapping", gModuleData->module_data[i].module_export_name) == 0 ||
@ -69,20 +54,7 @@ WUMS_RELOCATIONS_DONE(args) {
} }
} }
} }
#ifdef DEBUG deinitLogging();
if (moduleLogInit) {
WHBLogModuleDeinit();
moduleLogInit = false;
}
if (cafeLogInit) {
WHBLogCafeDeinit();
cafeLogInit = false;
}
if (udpLogInit) {
WHBLogUdpDeinit();
udpLogInit = false;
}
#endif // DEBUG
} }
#define R_PPC_NONE 0 #define R_PPC_NONE 0