From 77ad390d8e9c6112329221ed864dead455182b4e Mon Sep 17 00:00:00 2001 From: Julgodis <> Date: Mon, 27 Sep 2021 18:49:30 +0200 Subject: [PATCH] Format and clean up from merge. --- include/JSystem/JUtility/JUTDirectPrint.h | 2 ++ include/JSystem/JUtility/JUTException.h | 3 ++- include/dolphin/os/OS.h | 7 +++---- include/msl_c/string.h | 5 ++--- libs/JSystem/JUtility/JUTException.cpp | 3 ++- libs/JSystem/JUtility/JUTVideo.cpp | 17 ++++------------- .../MSL_Common/Src/printf.cpp | 10 ++++------ 7 files changed, 19 insertions(+), 28 deletions(-) diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index 8f2c2fbb4aa..8fac8cf23c6 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -22,6 +22,8 @@ public: /* 802E4240 */ static JUTDirectPrint* start(); + static JUTDirectPrint* getManager() { return sDirectPrint; } + private: static u8 sAsciiTable[128]; static u32 sFontData[64]; diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 129d6457459..eed808f7ba0 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,6 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" +#include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/gx/GX.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" @@ -26,7 +27,7 @@ public: /* 802E1D5C */ JUTException(JUTDirectPrint*); /* 802E1E40 */ void create(JUTDirectPrint*); /* 802E1FCC */ void errorHandler(u16, OSContext*, u32, u32); - /* 802E20C0 */ void panic_f_va(char const*, int, char const*, __va_list_struct*); + /* 802E20C0 */ void panic_f_va(char const*, int, char const*, va_list); /* 802E21FC */ static void panic_f(char const*, int, char const*, ...); /* 802E227C */ void setFPException(u32); /* 802E22C4 */ void showFloatSub(int, f32); diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index c972b90e927..bdc80cb1cd1 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -4,6 +4,7 @@ #ifndef OS_H_ #define OS_H_ +#include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/types.h" /* TODO: more structs, and get rid of the ones that are faked! */ @@ -122,8 +123,6 @@ struct OSThread { void* data[2]; }; -struct __va_list_struct {}; - extern "C" { s32 OSEnableScheduler(void); s32 OSDisableScheduler(void); @@ -165,7 +164,7 @@ void OSReportDisable(void); void OSReportEnable(void); void OSReportForceEnableOff(void); void OSReportForceEnableOn(void); -void OSVReport(const char* format, __va_list_struct* list); +void OSVReport(const char* format, va_list list); void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* out_time); OSTime OSGetTime(void); @@ -202,7 +201,7 @@ u8* OSGetStackPointer(void); void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); -void OSVAttention(const char* fmt, __va_list_struct* va_list); +void OSVAttention(const char* fmt, va_list args); void OSReportInit(void); diff --git a/include/msl_c/string.h b/include/msl_c/string.h index ceb5696ed19..902f205f09f 100644 --- a/include/msl_c/string.h +++ b/include/msl_c/string.h @@ -1,6 +1,7 @@ #ifndef MSL_STRING_H_ #define MSL_STRING_H_ +#include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/types.h" // TODO: move to MSL_C.PPCEABI.bare.H/ @@ -20,9 +21,7 @@ int tolower(int); int sprintf(char*, const char*, ...); int printf(const char*, ...); int snprintf(char*, u32, const char*, ...); - -struct __va_list_struct; -size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, __va_list_struct* args); +size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args); } #endif \ No newline at end of file diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index 44f9f6cc521..90f3fa6d340 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -4,6 +4,7 @@ // #include "JSystem/JUtility/JUTException.h" +#include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -336,7 +337,7 @@ static u8 context[712]; #pragma optimization_level 0 #pragma optimizewithasm off asm void JUTException::panic_f_va(char const* param_0, int param_1, char const* param_2, - __va_list_struct* param_3) { + va_list param_3) { nofralloc #include "asm/JSystem/JUtility/JUTException/panic_f_va__12JUTExceptionFPCciPCcP16__va_list_struct.s" } diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp index 87cb3f9d1b8..cff1fe483ed 100644 --- a/libs/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/JUtility/JUTVideo.cpp @@ -4,21 +4,12 @@ // #include "JSystem/JUtility/JUTVideo.h" +#include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTXfb.h" #include "dol2asm.h" #include "dolphin/types.h" #include "dolphin/vi/vi.h" -// -// Types: -// - -struct JUTDirectPrint { - /* 802E456C */ void changeFrameBuffer(void*, u16, u16); - - static JUTDirectPrint* sDirectPrint; -}; - // // External References: // @@ -37,8 +28,8 @@ JUTVideo* JUTVideo::sManager; OSTick JUTVideo::sVideoLastTick; /* 80451540-80451544 000A40 0004+00 2/2 1/1 0/0 .sbss sVideoInterval__8JUTVideo */ - OSTick JUTVideo::sVideoInterval; + /* 80451544-80451548 000A44 0004+00 4/4 0/0 0/0 .sbss None */ static bool data_80451544; @@ -123,8 +114,8 @@ void JUTVideo::preRetraceProc(u32 retrace_count) { if (frameBuffer) { JUTVideo* videoManager = JUTGetVideoManager(); const GXRenderModeObj* renderMode = videoManager->getRenderMode(); - JUTDirectPrint::sDirectPrint->changeFrameBuffer(frameBuffer, renderMode->fb_width, - renderMode->efb_height); + JUTDirectPrint* directPrint = JUTDirectPrint::getManager(); + directPrint->changeFrameBuffer(frameBuffer, renderMode->fb_width, renderMode->efb_height); } if (sManager->mSetBlack == 1) { diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp index 8c072de963c..be880016800 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp @@ -4,6 +4,7 @@ // #include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,12 +12,9 @@ // Forward References: // -struct __va_list_struct; - extern "C" void sprintf(); extern "C" void snprintf(); -extern "C" size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, - __va_list_struct* args); +extern "C" size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args); extern "C" void vprintf(); extern "C" void fprintf(); extern "C" void printf(); @@ -36,7 +34,6 @@ extern "C" extern char const* const MSL_Common_Src_printf__stringBase0; // SECTION_INIT void memcpy(); -extern "C" void __va_arg(); extern "C" void __div2u(); extern "C" void __mod2u(); extern "C" void __num2dec(); @@ -80,7 +77,7 @@ asm void snprintf() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, __va_list_struct* args) { +asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args) { nofralloc #include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s" } @@ -162,6 +159,7 @@ SECTION_SDATA static u8 data_80450AD8[2 + 6 /* padding */] = { #pragma optimizewithasm off asm void __pformatter() { nofralloc +#undef __va_arg #include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s" } #pragma pop