diff options
Diffstat (limited to 'src/m_Do/m_Do_printf.cpp')
| -rw-r--r-- | src/m_Do/m_Do_printf.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 5dcf89a8c2..3880b2d23f 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -25,12 +25,6 @@ extern "C" void mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct(); extern "C" void mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct(); extern "C" void mDoPrintf_vprintf__FPCcP16__va_list_struct(); extern "C" void mDoPrintf_VReport(const char* fmt, va_list args); -extern "C" void OSVReport(const char* fmt, va_list args); -extern "C" void OSReport(const char*, ...); -extern "C" void OSReport_FatalError(const char* fmt, ...); -extern "C" void OSReport_Error(const char* fmt, ...); -extern "C" void OSReport_Warning(const char* fmt, ...); -extern "C" void OSReport_System(const char* fmt, ...); extern "C" extern char const* const m_Do_m_Do_printf__stringBase0; // @@ -64,12 +58,12 @@ void my_PutString(const char* string) { } /* 800067F4-80006814 001134 0020+00 3/3 0/0 0/0 .text OSVAttention__FPCcP16__va_list_struct */ -void OSVAttention(char const* fmt, va_list args) { +void OSVAttention(char* fmt, va_list args) { mDoPrintf_vprintf(fmt, args); } /* 80006814-80006894 001154 0080+00 1/1 1/1 0/0 .text OSAttention */ -void OSAttention(const char* fmt, ...) { +void OSAttention(char* fmt, ...) { va_list args; va_start(args, fmt); mDoPrintf_vprintf(fmt, args); @@ -179,12 +173,12 @@ void mDoPrintf_VReport(const char* fmt, va_list args) { } /* 80006A9C-80006ABC 0013DC 0020+00 2/2 0/0 0/0 .text OSVReport */ -void OSVReport(const char* fmt, va_list args) { +void OSVReport(char* fmt, va_list args) { mDoPrintf_VReport(fmt, args); } /* 80006ABC-80006B3C 0013FC 0080+00 0/0 97/97 10/10 .text OSReport */ -void OSReport(const char* fmt, ...) { +void OSReport(char* fmt, ...) { va_list args; va_start(args, fmt); OSVReport(fmt, args); @@ -192,7 +186,7 @@ void OSReport(const char* fmt, ...) { } /* 80006B3C-80006C0C 00147C 00D0+00 0/0 2/2 0/0 .text OSReport_FatalError */ -void OSReport_FatalError(const char* fmt, ...) { +void OSReport_FatalError(char* fmt, ...) { va_list args; va_start(args, fmt); @@ -208,7 +202,7 @@ void OSReport_FatalError(const char* fmt, ...) { } /* 80006C0C-80006CEC 00154C 00E0+00 0/0 31/31 10/10 .text OSReport_Error */ -void OSReport_Error(const char* fmt, ...) { +void OSReport_Error(char* fmt, ...) { print_errors++; if (!data_80450B99) { va_list args; @@ -224,7 +218,7 @@ void OSReport_Error(const char* fmt, ...) { } /* 80006CEC-80006DCC 00162C 00E0+00 0/0 6/6 0/0 .text OSReport_Warning */ -void OSReport_Warning(const char* fmt, ...) { +void OSReport_Warning(char* fmt, ...) { print_warings++; if (!data_80450B9A) { va_list args; @@ -240,7 +234,7 @@ void OSReport_Warning(const char* fmt, ...) { } /* 80006DCC-80006E7C 00170C 00B0+00 0/0 1/1 0/0 .text OSReport_System */ -void OSReport_System(const char* fmt, ...) { +void OSReport_System(char* fmt, ...) { print_systems++; if (!data_80450B9B) { va_list args; @@ -265,7 +259,7 @@ SECTION_DEAD static char const* const stringBase_80373D4C = "0x%08x: 0x%08x /* 80006E7C-80006FB4 0017BC 0138+00 0/0 9/9 0/0 .text OSPanic */ // loop stuff / ending #ifdef NONMATCHING -void OSPanic(const char* file, s32 line, const char* fmt, ...) { +void OSPanic(char* file, s32 line, char* fmt, ...) { OSDisableInterrupts(); va_list args; @@ -291,7 +285,7 @@ void OSPanic(const char* file, s32 line, const char* fmt, ...) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSPanic(const char* file, s32 line, const char* fmt, ...) { +asm void OSPanic(char* file, s32 line, char* fmt, ...) { nofralloc #include "asm/m_Do/m_Do_printf/OSPanic.s" } |
