diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-09-24 08:11:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 11:11:10 -0400 |
| commit | 7d271be857c95c4a6c28d4d185378fba5c762c16 (patch) | |
| tree | f74ae846c613588585a07d81199a6495968b7257 /src/m_Do/m_Do_printf.cpp | |
| parent | ea42afb6f8a29f3a279b34efffcca365e308ca1e (diff) | |
m_Do cleanup, d_resource, drawlist stuff (#145)
* d_resource / some d_stage
* setup dDlst_list_c / d_select_icon OK
* JUTXfb / some JUTVideo + various
* some J2D classes / JUTVideo/Fader attempts
* bunch of m_Do cleanup + matches / f_ap_game OK
* mDoLib_clipper::setup OK
* most of d_meter_HIO OK
* pane_class / kantera_icon_meter
Diffstat (limited to 'src/m_Do/m_Do_printf.cpp')
| -rw-r--r-- | src/m_Do/m_Do_printf.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index ba6bd2e141..65b28ad9da 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -18,7 +18,7 @@ struct __va_list_struct {}; // extern "C" static void OSSwitchFiberEx__FUlUlUlUlUlUl(); -extern "C" static void my_PutString__FPCc(); +extern "C" void my_PutString__FPCc(); extern "C" static void OSVAttention__FPCcP16__va_list_struct(); extern "C" void OSAttention(); extern "C" void OSReportDisable(); @@ -50,10 +50,8 @@ extern "C" void OSDisableInterrupts(); extern "C" void OSRestoreInterrupts(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" void fputs(); extern "C" void fflush(); extern "C" void vprintf(); -extern "C" extern void* __files[80]; extern "C" extern u8 struct_80450B98[4]; extern "C" extern u8 data_80450B9C[4]; @@ -73,14 +71,9 @@ static asm void OSSwitchFiberEx(u32 param_0, u32 param_1, u32 param_2, u32 param #pragma pop /* 800067C8-800067F4 001108 002C+00 3/3 0/0 0/0 .text my_PutString__FPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void my_PutString(char const* param_0) { - nofralloc -#include "asm/m_Do/m_Do_printf/my_PutString__FPCc.s" +void my_PutString(const char* string) { + fputs(string, &__files.stdout); } -#pragma pop /* 800067F4-80006814 001134 0020+00 3/3 0/0 0/0 .text OSVAttention__FPCcP16__va_list_struct */ #pragma push @@ -175,7 +168,7 @@ asm void OSReportInit() { /* ############################################################################################## */ /* 803DB740-803DBF40 008460 0800+00 1/1 0/0 0/0 .bss mDoPrintf_FiberStack */ -static u8 mDoPrintf_FiberStack[2048]; +static u8 mDoPrintf_FiberStack[2048] ALIGN_DECL(32); /* 800068DC-80006964 00121C 0088+00 1/1 0/0 0/0 .text * mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct */ |