m_Do cleanup and c_dylink process names

1 files changed, 9 insertions, 40 deletions

diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index bb06b55ef5..58606fb4df 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -1,45 +1,16 @@
-//
-// Generated By: dol2asm
-// Translation Unit: m_Do/m_Do_printf
-//
+/**
+ * m_Do_printf.cpp
+ * OSReport and printf Helper Functions
+ */
 
 #include "m_Do/m_Do_printf.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dol2asm.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
-
-//
-// Forward References:
-//
-
-extern "C" void OSSwitchFiberEx__FUlUlUlUlUlUl(u32, u32, u32, u32, u32, u32);
-extern "C" void my_PutString__FPCc();
-extern "C" void OSVAttention__FPCcP16__va_list_struct();
-extern "C" void OSReportDisable();
-extern "C" void OSReportEnable();
-extern "C" void OSReportForceEnableOn();
-extern "C" void OSReportForceEnableOff();
-extern "C" void OSReportInit__Fv();
-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" extern char const* const m_Do_m_Do_printf__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" OSThread* mDoExt_GetCurrentRunningThread__Fv();
-extern "C" void PPCHalt();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_29();
-extern "C" s32 fflush(FILE*);
-
-//
-// Declarations:
-//
+#include "m_Do/m_Do_ext.h"
+#include "dolphin/base/PPCArch.h"
+#include "MSL_C/MSL_Common/Src/file_io.h"
 
 /* 80006798-800067C8 0010D8 0030+00 1/1 0/0 0/0 .text            OSSwitchFiberEx__FUlUlUlUlUlUl */
 #pragma push
@@ -145,7 +116,7 @@ void mDoPrintf_vprintf_Thread(char const* fmt, va_list args) {
 /* 80006984-80006A10 0012C4 008C+00 4/4 0/0 0/0 .text mDoPrintf_vprintf__FPCcP16__va_list_struct
  */
 void mDoPrintf_vprintf(char const* fmt, va_list args) {
-    OSThread* currentThread = mDoExt_GetCurrentRunningThread__Fv();
+    OSThread* currentThread = mDoExt_GetCurrentRunningThread();
     if (currentThread == NULL) {
         mDoPrintf_vprintf_Interrupt(fmt, args);
     } else {
@@ -164,7 +135,7 @@ void mDoPrintf_VReport(const char* fmt, va_list args) {
         OSReportInit();
     }
     if (__OSReport_enable || !__OSReport_disable) {
-        OSThread* currentThread = mDoExt_GetCurrentRunningThread__Fv();
+        OSThread* currentThread = mDoExt_GetCurrentRunningThread();
         if (__OSReport_MonopolyThread == NULL || __OSReport_MonopolyThread == currentThread) {
             mDoPrintf_vprintf(fmt, args);
             print_counts++;
@@ -268,5 +239,3 @@ void OSPanic(char* file, s32 line, char* fmt, ...) {
     *tmp = 0x1234567;
     PPCHalt();
 }
-
-/* 80373CB0-80373CB0 000310 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */