Fix symbol names (#118)

* checkpoint

* checkpoint

* rename f_pc

* checkpoint

* small symbol rename and fix some fpc symbols

* remove unneeded entries from ldscript

* simplify ok check, update docker container

Co-authored-by: Pheenoh <pheenoh@gmail.com>

1 files changed, 72 insertions, 75 deletions

diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp
index 9420d970ce..eebd446b57 100644
--- a/src/m_Do/m_Do_dvd_thread.cpp
+++ b/src/m_Do/m_Do_dvd_thread.cpp
@@ -1,12 +1,13 @@
 /* m_Do_dvd_thread.cpp autogenerated by split.py v0.4 at 2021-01-31 21:23:39.416871 */
 
+#include "SComponent/c_list.h"
 #include "global.h"
 
 // additional symbols needed for m_Do_dvd_thread.cpp
 // autogenerated by split.py v0.4 at 2021-01-31 21:23:39.416919
 extern "C" {
-void JASDvd_NS_getThreadPointer(void);
-void JASTaskThread_NS_sendCmdMsg(void);
+void getThreadPointer__6JASDvdFv(void);
+void sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl(void);
 void __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection(void);
 void __ct__9JKRThreadFP8OSThreadi(void);
 void __dl__FPv(void);
@@ -21,52 +22,48 @@ void _savegpr_27(void);
 void _savegpr_28(void);
 void _savegpr_29(void);
 void becomeCurrentHeap__7JKRHeapFv(void);
-void cLs_Addition(void);
-void cLs_Create(void);
-void cLs_SingleCut(void);
-void cNd_ForcedClear(void);
 void cb(void);
-void func_80015BB8(void);
-void func_80015CF0(void);
-void func_80015D44(void);
-void func_80015EDC(void);
-void func_80016108(void);
-void func_800162B0(void);
-void func_8001645C(void);
-void func_800164BC(void);
-void func_80016574(void);
+void __dt__20mDoDvdThd_callback_cFv(void);
+void execute__20mDoDvdThd_callback_cFv(void);
+void __dt__24mDoDvdThd_mountArchive_cFv(void);
+void execute__24mDoDvdThd_mountArchive_cFv(void);
+void __dt__25mDoDvdThd_mountXArchive_cFv(void);
+void execute__25mDoDvdThd_mountXArchive_cFv(void);
+void __dt__21mDoDvdThd_toMainRam_cFv(void);
+void execute__21mDoDvdThd_toMainRam_cFv(void);
+void __sinit_m_Do_dvd_thread_cpp(void);
 void getSize__7JKRHeapCFPv(void);
 void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(
     void);
-void mDoDvdThd_NS_create(void);
-void mDoDvdThd_NS_main(void);
-void mDoDvdThd_NS_suspend(void);
-void mDoDvdThd_callback_c(void);
-void mDoDvdThd_callback_c_NS_create(void);
-void mDoDvdThd_command_c(void);
-void mDoDvdThd_command_c_NS_dtor(void);
-void mDoDvdThd_mountArchive_c(void);
-void mDoDvdThd_mountArchive_c_NS_create(void);
-void mDoDvdThd_mountXArchive_c(void);
-void mDoDvdThd_mountXArchive_c_NS_create(void);
-void mDoDvdThd_param_c(void);
-void mDoDvdThd_param_c_NS_addition(void);
-void mDoDvdThd_param_c_NS_cut(void);
-void mDoDvdThd_param_c_NS_getFirstCommand(void);
-void mDoDvdThd_param_c_NS_kick(void);
-void mDoDvdThd_param_c_NS_mainLoop(void);
-void mDoDvdThd_param_c_NS_waitForKick(void);
-void mDoDvdThd_toMainRam_c(void);
-void mDoDvdThd_toMainRam_c_NS_create(void);
-void mDoExt_getArchiveHeap(void);
-void mDoExt_getArchiveHeapPtr(void);
-void mDoExt_getAssertHeap(void);
-void mDoExt_getCommandHeap(void);
-void mDoExt_getGameHeap(void);
-void mDoExt_getJ2dHeap(void);
-void mDoExt_getZeldaHeap(void);
+void create__9mDoDvdThdFl(void);
+void main__9mDoDvdThdFPv(void);
+void suspend__9mDoDvdThdFv(void);
+void __ct__20mDoDvdThd_callback_cFPFPv_PvPv(void);
+void create__20mDoDvdThd_callback_cFPFPv_PvPv(void);
+void __ct__19mDoDvdThd_command_cFv(void);
+void __dt__19mDoDvdThd_command_cFv(void);
+void __ct__24mDoDvdThd_mountArchive_cFUc(void);
+void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap(void);
+void __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode(void);
+void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(void);
+void __ct__17mDoDvdThd_param_cFv(void);
+void addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void);
+void cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void);
+void getFirstCommand__17mDoDvdThd_param_cFv(void);
+void kick__17mDoDvdThd_param_cFv(void);
+void mainLoop__17mDoDvdThd_param_cFv(void);
+void waitForKick__17mDoDvdThd_param_cFv(void);
+void __ct__21mDoDvdThd_toMainRam_cFUc(void);
+void create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap(void);
+void mDoExt_getArchiveHeap__Fv(void);
+void mDoExt_getArchiveHeapPtr__Fv(void);
+void mDoExt_getAssertHeap__Fv(void);
+void mDoExt_getCommandHeap__Fv(void);
+void mDoExt_getGameHeap__Fv(void);
+void mDoExt_getJ2dHeap__Fv(void);
+void mDoExt_getZeldaHeap__Fv(void);
 void mount__10JKRArchiveFlQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection(void);
-void my_DVDConvertPathToEntrynum(void);
+void my_DVDConvertPathToEntrynum__FPCc(void);
 }
 
 // additional symbols needed for m_Do_dvd_thread.cpp
@@ -85,217 +82,217 @@ extern u8 lbl_80450C81;
 extern "C" {
 // main__9mDoDvdThdFPv
 // mDoDvdThd::main(void*)
-asm void mDoDvdThd_NS_main(void) {
+asm void main__9mDoDvdThdFPv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800157FC.s"
 }
 
 // create__9mDoDvdThdFl
 // mDoDvdThd::create(s32)
-asm void mDoDvdThd_NS_create(void) {
+asm void create__9mDoDvdThdFl(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015858.s"
 }
 
 // suspend__9mDoDvdThdFv
 // mDoDvdThd::suspend(void)
-asm void mDoDvdThd_NS_suspend(void) {
+asm void suspend__9mDoDvdThdFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800158B4.s"
 }
 
 // my_DVDConvertPathToEntrynum__FPCc
-// my_DVDConvertPathToEntrynum(const s8*)
-asm void my_DVDConvertPathToEntrynum(void) {
+// my_DVDConvertPathToEntrynum__FPCc(const s8*)
+asm void my_DVDConvertPathToEntrynum__FPCc(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800158DC.s"
 }
 
 // __dt__19mDoDvdThd_command_cFv
 // mDoDvdThd_command_c::~mDoDvdThd_command_c(void)
-asm void mDoDvdThd_command_c_NS_dtor(void) {
+asm void __dt__19mDoDvdThd_command_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800158FC.s"
 }
 
 // __ct__17mDoDvdThd_param_cFv
 // mDoDvdThd_param_c::mDoDvdThd_param_c(void)
-asm void mDoDvdThd_param_c(void) {
+asm void __ct__17mDoDvdThd_param_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015944.s"
 }
 
 // kick__17mDoDvdThd_param_cFv
 // mDoDvdThd_param_c::kick(void)
-asm void mDoDvdThd_param_c_NS_kick(void) {
+asm void kick__17mDoDvdThd_param_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_8001598C.s"
 }
 
 // waitForKick__17mDoDvdThd_param_cFv
 // mDoDvdThd_param_c::waitForKick(void)
-asm void mDoDvdThd_param_c_NS_waitForKick(void) {
+asm void waitForKick__17mDoDvdThd_param_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800159B4.s"
 }
 
 // getFirstCommand__17mDoDvdThd_param_cFv
 // mDoDvdThd_param_c::getFirstCommand(void)
-asm void mDoDvdThd_param_c_NS_getFirstCommand(void) {
+asm void getFirstCommand__17mDoDvdThd_param_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800159DC.s"
 }
 
 // addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c
 // mDoDvdThd_param_c::addition(mDoDvdThd_command_c*)
-asm void mDoDvdThd_param_c_NS_addition(void) {
+asm void addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800159E4.s"
 }
 
 // cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c
 // mDoDvdThd_param_c::cut(mDoDvdThd_command_c*)
-asm void mDoDvdThd_param_c_NS_cut(void) {
+asm void cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015A3C.s"
 }
 
 // cb__FPv
 // cb(void*)
-asm void cb(void) {
+asm void cb__FPv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015A90.s"
 }
 
 // mainLoop__17mDoDvdThd_param_cFv
 // mDoDvdThd_param_c::mainLoop(void)
-asm void mDoDvdThd_param_c_NS_mainLoop(void) {
+asm void mainLoop__17mDoDvdThd_param_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015AD8.s"
 }
 
 // __ct__19mDoDvdThd_command_cFv
 // mDoDvdThd_command_c::mDoDvdThd_command_c(void)
-asm void mDoDvdThd_command_c(void) {
+asm void __ct__19mDoDvdThd_command_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015B74.s"
 }
 
 // __dt__20mDoDvdThd_callback_cFv
 // mDoDvdThd_callback_c::~mDoDvdThd_callback_c(void)
-asm void func_80015BB8(void) {
+asm void __dt__20mDoDvdThd_callback_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015BB8.s"
 }
 
 // __ct__20mDoDvdThd_callback_cFPFPv_PvPv
 // mDoDvdThd_callback_c::mDoDvdThd_callback_c(void* (*)(void*), void*)
-asm void mDoDvdThd_callback_c(void) {
+asm void __ct__20mDoDvdThd_callback_cFPFPv_PvPv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015C18.s"
 }
 
 // create__20mDoDvdThd_callback_cFPFPv_PvPv
 // mDoDvdThd_callback_c::create(void* (*)(void*), void*)
-asm void mDoDvdThd_callback_c_NS_create(void) {
+asm void create__20mDoDvdThd_callback_cFPFPv_PvPv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015C74.s"
 }
 
 // execute__20mDoDvdThd_callback_cFv
 // mDoDvdThd_callback_c::execute(void)
-asm void func_80015CF0(void) {
+asm void execute__20mDoDvdThd_callback_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015CF0.s"
 }
 
 // __dt__24mDoDvdThd_mountArchive_cFv
 // mDoDvdThd_mountArchive_c::~mDoDvdThd_mountArchive_c(void)
-asm void func_80015D44(void) {
+asm void __dt__24mDoDvdThd_mountArchive_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015D44.s"
 }
 
 // __ct__24mDoDvdThd_mountArchive_cFUc
 // mDoDvdThd_mountArchive_c::mDoDvdThd_mountArchive_c(u8)
-asm void mDoDvdThd_mountArchive_c(void) {
+asm void __ct__24mDoDvdThd_mountArchive_cFUc(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015DA4.s"
 }
 
 // create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap
 // mDoDvdThd_mountArchive_c::create(const s8*, u8, JKRHeap*)
-asm void mDoDvdThd_mountArchive_c_NS_create(void) {
+asm void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015E14.s"
 }
 
 // execute__24mDoDvdThd_mountArchive_cFv
 // mDoDvdThd_mountArchive_c::execute(void)
-asm void func_80015EDC(void) {
+asm void execute__24mDoDvdThd_mountArchive_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80015EDC.s"
 }
 
 // __dt__25mDoDvdThd_mountXArchive_cFv
 // mDoDvdThd_mountXArchive_c::~mDoDvdThd_mountXArchive_c(void)
-asm void func_80016108(void) {
+asm void __dt__25mDoDvdThd_mountXArchive_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80016108.s"
 }
 
 // __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode
 // mDoDvdThd_mountXArchive_c::mDoDvdThd_mountXArchive_c(u8, JKRArchive::EMountMode)
-asm void mDoDvdThd_mountXArchive_c(void) {
+asm void __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80016168.s"
 }
 
 // create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap
 // mDoDvdThd_mountXArchive_c::create(const s8*, u8, JKRArchive::EMountMode, JKRHeap*)
-asm void mDoDvdThd_mountXArchive_c_NS_create(void) {
+asm void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800161E0.s"
 }
 
 // execute__25mDoDvdThd_mountXArchive_cFv
 // mDoDvdThd_mountXArchive_c::execute(void)
-asm void func_800162B0(void) {
+asm void execute__25mDoDvdThd_mountXArchive_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800162B0.s"
 }
 
 // __ct__21mDoDvdThd_toMainRam_cFUc
 // mDoDvdThd_toMainRam_c::mDoDvdThd_toMainRam_c(u8)
-asm void mDoDvdThd_toMainRam_c(void) {
+asm void __ct__21mDoDvdThd_toMainRam_cFUc(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80016338.s"
 }
 
 // create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap
 // mDoDvdThd_toMainRam_c::create(const s8*, u8, JKRHeap*)
-asm void mDoDvdThd_toMainRam_c_NS_create(void) {
+asm void create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80016394.s"
 }
 
 // __dt__21mDoDvdThd_toMainRam_cFv
 // mDoDvdThd_toMainRam_c::~mDoDvdThd_toMainRam_c(void)
-asm void func_8001645C(void) {
+asm void __dt__21mDoDvdThd_toMainRam_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_8001645C.s"
 }
 
 // execute__21mDoDvdThd_toMainRam_cFv
 // mDoDvdThd_toMainRam_c::execute(void)
-asm void func_800164BC(void) {
+asm void execute__21mDoDvdThd_toMainRam_cFv(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_800164BC.s"
 }
 
 // __sinit_m_Do_dvd_thread_cpp
 //
-asm void func_80016574(void) {
+asm void __sinit_m_Do_dvd_thread_cpp(void) {
     nofralloc
 #include "m_Do/m_Do_dvd_thread/asm/func_80016574.s"
 }