diff --git a/config/disasm_overrides.yml b/config/disasm_overrides.yml index 28c9c2ed..5c4cbf97 100644 --- a/config/disasm_overrides.yml +++ b/config/disasm_overrides.yml @@ -4,4 +4,5 @@ symbol_aligns: 0x80207458: 8 # align RunQueue to 0x001251d8 0x800b9140: 32 # align gam_win_moji1_tex to 32 bytes 0x801f71c0: 32 # align texture_buffer_data to 32 bytes - 0x800daaa0: 32 # align texture_cache_data_func to 32 bytes \ No newline at end of file + 0x800daaa0: 32 # align texture_cache_data_func to 32 bytes + 0x80206f30: 16 # malloc.c align 16 bytes \ No newline at end of file diff --git a/config/dol_slices.yml b/config/dol_slices.yml index c338a864..182acb65 100644 --- a/config/dol_slices.yml +++ b/config/dol_slices.yml @@ -52,11 +52,11 @@ libforest/osreport.c: .data: [0x800dc6d8, 0x800dc738] .bss: [0x80206f08, 0x80206f20] .sbss: [0x80218618, 0x80218628] -#libforest/fault.c: -# .text: [0x8005a92c, 0x8005adac] -# .data: [0x800dc738, 0x800dc7c8] -# .bss: [0x80206f20, 0x80206f30] -# .sbss: [0x80218628, 0x80218630] +libforest/fault.c: + .text: [0x8005a92c, 0x8005adac] + .data: [0x800dc738, 0x800dc7c8] + .bss: [0x80206f20, 0x80206f30] + .sbss: [0x80218628, 0x80218630] libforest/ReconfigBATs.c: .text: [0x8005adac, 0x8005aed4] libu64/debug.c: diff --git a/include/libjsys/jsyswrapper.h b/include/libjsys/jsyswrapper.h index 24d6e313..820e1143 100644 --- a/include/libjsys/jsyswrapper.h +++ b/include/libjsys/jsyswrapper.h @@ -4,6 +4,7 @@ #include "types.h" #include "JSystem/JKernel/JKREnum.h" #include "JSystem/JUtility/JUTEnum.h" +#include "va_args.h" #ifdef __cplusplus extern "C" { @@ -144,6 +145,7 @@ extern void JC_JUTConsole_scrollToFirstLine(void* console); extern void JC_JUTConsole_scroll(void* console, int amount); extern u32 JC_JUTConsole_getHeight(void* console); extern u32 JC_JUTConsole_getUsedLine(void* console); +extern void JC_JUTConsole_print_f_va(void* console, const char* fmt, va_list arg); extern void* JC_JUTConsoleManager_getManager(); extern void JC_JUTConsoleManager_drawDirect(void* manager, int direct); diff --git a/src/libforest/fault.c b/src/libforest/fault.c index 720a2256..610b3074 100644 --- a/src/libforest/fault.c +++ b/src/libforest/fault.c @@ -1,8 +1,10 @@ -#include "fault.h" +#include "libforest/fault.h" #include "terminal.h" #include "va_args.h" +#include "libjsys/jsyswrapper.h" +#include "dolphin/os.h" -/*__declspec(section ".sdata")*/ static fault* this; +static fault* this = NULL; static fault fault_class; extern void fault_AddClientEx(fault_client* client, FaultCallback callback, const char* msg, u32 param, u8 priority, u8 flags) { @@ -48,7 +50,7 @@ extern void fault_AddClientEx(fault_client* client, FaultCallback callback, cons exit: OSRestoreInterrupts(enable); if (client_exists != FALSE) { - OSReport(VT_COL(VT_COLOR_RED,VT_COLOR_WHITE) "fault_AddClient: %08x は既にリスト中にある\n%x" VT_RST, client); + OSReport(VT_COL(RED, WHITE) "fault_AddClient: %08x は既にリスト中にある\n" VT_RST, client); } }