From 82a0f8f8ab0595ddff962a0142462102e8b093d1 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sun, 31 Jan 2021 15:45:36 -0500 Subject: [PATCH] clang-format --- include/SComponent/c_xyz.h | 2 +- libs/JSystem/JKernel/JKRAramArchive.cpp | 5 ++-- libs/JSystem/JKernel/JKRAramHeap.cpp | 2 +- libs/JSystem/JKernel/JKRCompArchive.cpp | 3 ++- libs/JSystem/JKernel/JKRDvdArchive.cpp | 3 ++- libs/JSystem/JKernel/JKRDvdRipper.cpp | 3 ++- libs/JSystem/JKernel/JKRExpHeap.cpp | 6 +++-- libs/JSystem/JKernel/JKRMemArchive.cpp | 3 ++- libs/JSystem/JUtility/JUTResFont.cpp | 11 +++++--- src/d/d_camera.cpp | 1 + src/d/d_com/d_com_inf_game.cpp | 4 +-- src/f/f_pc/f_pc_manager.cpp | 2 +- src/f/f_pc/f_pc_node_req.cpp | 2 +- src/m_Do/m_Do_DVDError.cpp | 34 ++++++++++++------------- 14 files changed, 45 insertions(+), 36 deletions(-) diff --git a/include/SComponent/c_xyz.h b/include/SComponent/c_xyz.h index c90abbd47da..1893872f891 100644 --- a/include/SComponent/c_xyz.h +++ b/include/SComponent/c_xyz.h @@ -2,8 +2,8 @@ #define C_XYZ_H_ #include "SComponent/c_math.h" -#include "mtx_vec.h" #include "global.h" +#include "mtx_vec.h" extern f32 /* 1.0 */ lbl_80455070; extern f32 /* epsilon */ lbl_80455074; diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 897f7760467..cefd553d66b 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -1,6 +1,6 @@ #include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h" -#include "global.h" #include "JSystem/JKernel/JKRFile/JKRFile.h" +#include "global.h" extern "C" { int abs(int); void __ct__10JKRArchiveFlQ210JKRArchive10EMountMode(void); @@ -23,7 +23,8 @@ void free__7JKRHeapFPvP7JKRHeap(void); void getAramAddress_Entry__14JKRAramArchiveFP12SDIFileEntry(void); void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void); -void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void); +void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( + void); void open__14JKRAramArchiveFl(void); void prepend__10JSUPtrListFP10JSUPtrLink(void); void remove__10JSUPtrListFP10JSUPtrLink(void); diff --git a/libs/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/JKernel/JKRAramHeap.cpp index 85d52f3066d..556dee1ea96 100644 --- a/libs/JSystem/JKernel/JKRAramHeap.cpp +++ b/libs/JSystem/JKernel/JKRAramHeap.cpp @@ -1,6 +1,6 @@ #include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h" -#include "global.h" #include "JSystem/JKernel/JKRAramBlock/JKRAramBlock.h" +#include "global.h" extern "C" { void __dl__FPv(void); void __dt__11JKRDisposerFv(void); diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 431973eea2b..07bc6265369 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -24,7 +24,8 @@ void free__7JKRHeapFPv(void); void free__7JKRHeapFPvP7JKRHeap(void); void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void); -void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void); +void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( + void); void mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl(void); void open__14JKRCompArchiveFl(void); void orderSync__9JKRDecompFPUcPUcUlUl(void); diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index 070d6ff322d..2a96f0ee6a3 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -14,7 +14,8 @@ void DCInvalidateRange(void*, u32); void fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii(void); void free__7JKRHeapFPv(void); void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); -void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void); +void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( + void); void* memset(void* dest, int ch, u32 count); } diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 172f7e630cc..d0e87b5b8bf 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -16,7 +16,8 @@ void free__7JKRHeapFPvP7JKRHeap(void); void isErrorRetry__12JKRDvdRipperFv(void); void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl(void); void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); -void loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void); +void loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( + void); void memcpy(void*, const void*, int); void nextSrcData__FPUc(void); void open__10JKRDvdFileFl(void); diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp index b354aa26dd3..2eba5c01fc8 100644 --- a/libs/JSystem/JKernel/JKRExpHeap.cpp +++ b/libs/JSystem/JKernel/JKRExpHeap.cpp @@ -25,7 +25,8 @@ void getMaxAllocatableSize__7JKRHeapCFi(void); void getTotalFreeSize__7JKRHeapCFv(void); void getUsedSize__10JKRExpHeapCFUc(void); void initArena__7JKRHeapFPPcPUli(void); -void initiate__Q210JKRExpHeap9CMemBlockFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockUlUcUc(void); +void initiate__Q210JKRExpHeap9CMemBlockFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockUlUcUc( + void); void joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void); void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); void JUTReportConsole_f(const char*, ...); @@ -35,7 +36,8 @@ void JUTWarningConsole(void); void recycleFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void); void removeFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void); void removeUsedBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void); -void setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock(void); +void setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock( + void); } asm void JKRExpHeap::createRoot(int, bool) { diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index b6e25a0324e..a06f057fc9e 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -6,7 +6,8 @@ extern "C" { void DCInvalidateRange(void*, u32); void findFromRoot__7JKRHeapFPv(void); void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); -void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void); +void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( + void); void memcpy(void*, const void*, int); } diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index 94230e3edc0..50f50116fcb 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -5,11 +5,14 @@ void __nwa__FUlP7JKRHeapi(void); void JUTReportConsole(const char*); void convertSjis__10JUTResFontCFiPUs(); // remove when JUTResFont::getFontCode decompiled void getFontCode__10JUTResFontCFi(); // remove when JUTResFont::getWidthEntry decompiled -void loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth(); // remove when JUTResFont::drawChar_scale decompiled -void countBlock__10JUTResFontFv(); // remove when JUTResFont::protected_initiate decompiled -void initialize_state__7JUTFontFv(); // remove when JUTResFont::protected_initiate decompiled +void loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth(); // remove when + // JUTResFont::drawChar_scale + // decompiled +void countBlock__10JUTResFontFv(); // remove when JUTResFont::protected_initiate decompiled +void initialize_state__7JUTFontFv(); // remove when JUTResFont::protected_initiate decompiled void initialize_state__10JUTResFontFv(); // remove when JUTResFont::protected_initiate decompiled -void deleteMemBlocks_ResFont__10JUTResFontFv(); // remove when JUTResFont::protected_initiate decompiled +void deleteMemBlocks_ResFont__10JUTResFontFv(); // remove when JUTResFont::protected_initiate + // decompiled } extern float lbl_80455FF0; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index ea9b4fe6bb7..4ee9537e5e5 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -14,6 +14,7 @@ #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h" extern "C" { +void __dt__8cM3dGLinFv(void); double func_8036C668(double); int func_80368954(char*, char*, u32); int strcmp(const char*, const char*); diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp index 2a398f39d81..6ea0f4d3684 100644 --- a/src/d/d_com/d_com_inf_game.cpp +++ b/src/d/d_com/d_com_inf_game.cpp @@ -802,8 +802,8 @@ void dComIfGp_mapHide(void) { asm bool dComIfGp_checkMapShow(void) { nofralloc - #include "d/d_com/d_com_inf_game/asm/func_8002E0A8.s" - //return !dComIfGs_isEventBit(0x1D01); +#include "d/d_com/d_com_inf_game/asm/func_8002E0A8.s" + // return !dComIfGs_isEventBit(0x1D01); } // dComIfGp_setHeapLockFlag__FUc diff --git a/src/f/f_pc/f_pc_manager.cpp b/src/f/f_pc/f_pc_manager.cpp index 2c73093a956..751ad4dba80 100644 --- a/src/f/f_pc/f_pc_manager.cpp +++ b/src/f/f_pc/f_pc_manager.cpp @@ -30,7 +30,7 @@ void dDlst_peekZ_c_NS_peekData(dDlst_peekZ_c*); void fpcDw_Execute(base_process_class* pProc); void fpcDw_Handler(void*, void*); base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID, - FastCreateReqFunc param_3, void* param_4, void* pData); + FastCreateReqFunc param_3, void* param_4, void* pData); void* fpcCtIt_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData); } diff --git a/src/f/f_pc/f_pc_node_req.cpp b/src/f/f_pc/f_pc_node_req.cpp index e5955ec4bd0..e2d22d89377 100644 --- a/src/f/f_pc/f_pc_node_req.cpp +++ b/src/f/f_pc/f_pc_node_req.cpp @@ -14,7 +14,7 @@ extern "C" { void free__3cMlFPv(void* pPtr); void* memalignB__3cMlFiUl(int pAlign, u32 pSize); void sBs_ClearArea(void* pPtr, s32 pSize); -s32 fpcSCtRq_Request(layer_class*, s16, process_method_func, void*, void*); +// s32 fpcSCtRq_Request(layer_class*, s16, process_method_func, void*, void*); } // f_pc_node_req::l_fpcNdRq_Queue diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index 7b802c0e06e..366e1ad78da 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -1,23 +1,23 @@ /* m_Do_DVDError.cpp autogenerated by split.py v0.4 at 2021-01-25 20:08:33.714341 */ -#include "global.h" #include "dvd/dvd.h" +#include "global.h" #include "os/os.h" // additional symbols needed for m_Do_DVDError.cpp // autogenerated by split.py v0.4 at 2021-01-25 20:08:33.714380 extern "C" { - void AlarmHandler(void); - void OSCancelAlarm(void); - void OSCreateAlarm(void); - void OSSetPeriodicAlarm(void); - void __RAS_OSDisableInterrupts_begin(void); - void __ct__9JKRThreadFP8OSThreadi(void); - void __dt__9JKRThreadFv(void); - void becomeCurrentHeap__7JKRHeapFv(void); - void mDoDvdErr_Watch(void); - void mDoDvdThd_NS_suspend(void); - void mDoExt_getAssertHeap(void); +void AlarmHandler(void); +void OSCancelAlarm(void); +void OSCreateAlarm(void); +void OSSetPeriodicAlarm(void); +void __RAS_OSDisableInterrupts_begin(void); +void __ct__9JKRThreadFP8OSThreadi(void); +void __dt__9JKRThreadFv(void); +void becomeCurrentHeap__7JKRHeapFv(void); +void mDoDvdErr_Watch(void); +void mDoDvdThd_NS_suspend(void); +void mDoExt_getAssertHeap(void); } // additional symbols needed for m_Do_DVDError.cpp @@ -26,34 +26,32 @@ extern u8 lbl_803DECC0; extern u8 lbl_803DFBE0; extern u8 lbl_80450C88; - extern "C" { // mDoDvdErr_ThdInit__Fv // mDoDvdErr_ThdInit(void) asm void mDoDvdErr_ThdInit(void) { nofralloc - #include "m_Do/m_Do_DVDError/asm/func_8001659C.s" +#include "m_Do/m_Do_DVDError/asm/func_8001659C.s" } // mDoDvdErr_ThdCleanup__Fv // mDoDvdErr_ThdCleanup(void) asm void mDoDvdErr_ThdCleanup(void) { nofralloc - #include "m_Do/m_Do_DVDError/asm/func_8001665C.s" +#include "m_Do/m_Do_DVDError/asm/func_8001665C.s" } // mDoDvdErr_Watch__FPv // mDoDvdErr_Watch(void*) asm void mDoDvdErr_Watch(void) { nofralloc - #include "m_Do/m_Do_DVDError/asm/func_800166A4.s" +#include "m_Do/m_Do_DVDError/asm/func_800166A4.s" } // AlarmHandler__FP7OSAlarmP9OSContext // AlarmHandler(OSAlarm*, OSContext*) asm void AlarmHandler(void) { nofralloc - #include "m_Do/m_Do_DVDError/asm/func_80016704.s" +#include "m_Do/m_Do_DVDError/asm/func_80016704.s" } - };