diff --git a/libs/JSystem/check.py b/libs/JSystem/check.py index fcaa258e..0182df44 100644 --- a/libs/JSystem/check.py +++ b/libs/JSystem/check.py @@ -31,16 +31,34 @@ class FunctionLibrary: with open(pathlib.Path(f"csv/{file}"), "r") as input: is_first_line = True for line in input: + print(line) if is_first_line: is_first_line = False continue + bracketCounter = 0 + replacements = [] + for i, c in enumerate(line): + if c == '<': + bracketCounter += 1 + elif c == '>': + bracketCounter -= 1 + elif bracketCounter > 0 and c == ',': + replacements += [i] + offset = 0 + for i in replacements: + line = line[:i + offset] + ',' + line[i + offset + 1:] + offset += 4 + if len(replacements) > 0: + print(line) line_split = line.rstrip().split(",") - symbol = line_split[0].replace(",", ",") + symbol = line_split[0] + obj_file = line_split[1] library_name = line_split[2] + print(line) matches = line_split[3] == "true" if (symbol, obj_file) in symbols: diff --git a/libs/JSystem/csv/J3DGraphLoader.csv b/libs/JSystem/csv/J3DGraphLoader.csv index 7075b57b..27425044 100644 --- a/libs/JSystem/csv/J3DGraphLoader.csv +++ b/libs/JSystem/csv/J3DGraphLoader.csv @@ -138,15 +138,15 @@ __ct__10J3DTextureFUsP7ResTIMG,J3DModelLoader.o,J3DGraphLoader.a,false __dt__10J3DTextureFv,J3DModelLoader.o,J3DGraphLoader.a,false setMtxType__8J3DJointFUc,J3DModelLoader.o,J3DGraphLoader.a,false __dt__19J3DMtxCalcNoAnmBaseFv,J3DModelLoader.o,J3DGraphLoader.a,false -__dt__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>Fv,J3DModelLoader.o,J3DGraphLoader.a,false -init__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>FRC3VecRA3_A4_Cf,J3DModelLoader.o,J3DGraphLoader.a,false -calc__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>Fv,J3DModelLoader.o,J3DGraphLoader.a,false -__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv,J3DModelLoader.o,J3DGraphLoader.a,false -init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf,J3DModelLoader.o,J3DGraphLoader.a,false -calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv,J3DModelLoader.o,J3DGraphLoader.a,false -__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv,J3DModelLoader.o,J3DGraphLoader.a,false -init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf,J3DModelLoader.o,J3DGraphLoader.a,false -calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv,J3DModelLoader.o,J3DGraphLoader.a,false +__dt__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>Fv,J3DModelLoader.o,J3DGraphLoader.a,false +init__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>FRC3VecRA3_A4_Cf,J3DModelLoader.o,J3DGraphLoader.a,false +calc__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>Fv,J3DModelLoader.o,J3DGraphLoader.a,false +__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv,J3DModelLoader.o,J3DGraphLoader.a,false +init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf,J3DModelLoader.o,J3DGraphLoader.a,false +calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv,J3DModelLoader.o,J3DGraphLoader.a,false +__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv,J3DModelLoader.o,J3DGraphLoader.a,false +init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf,J3DModelLoader.o,J3DGraphLoader.a,false +calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv,J3DModelLoader.o,J3DGraphLoader.a,false countMaterialNum__14J3DModelLoaderFPCv,J3DModelLoaderCalcSize.o,J3DGraphLoader.a,false calcLoadSize__14J3DModelLoaderFPCvUl,J3DModelLoaderCalcSize.o,J3DGraphLoader.a,false calcLoadMaterialTableSize__14J3DModelLoaderFPCv,J3DModelLoaderCalcSize.o,J3DGraphLoader.a,false diff --git a/libs/JSystem/csv/JAudio2.csv b/libs/JSystem/csv/JAudio2.csv index d972af1c..66ef5749 100644 --- a/libs/JSystem/csv/JAudio2.csv +++ b/libs/JSystem/csv/JAudio2.csv @@ -12,9 +12,9 @@ allocCallStack__13JASTaskThreadFPFPv_vPv,JASTaskThread.o,JAudio2.a,false sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl,JASTaskThread.o,JAudio2.a,false sendCmdMsg__13JASTaskThreadFPFPv_vPv,JASTaskThread.o,JAudio2.a,false run__13JASTaskThreadFv,JASTaskThread.o,JAudio2.a,false -free__64JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>FPv,JASTaskThread.o,JAudio2.a,false -alloc__64JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>FUl,JASTaskThread.o,JAudio2.a,false -__ct__Q264JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>11MemoryChunkFPQ264JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>11MemoryChunk,JASTaskThread.o,JAudio2.a,false +free__64JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>FPv,JASTaskThread.o,JAudio2.a,false +alloc__64JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>FUl,JASTaskThread.o,JAudio2.a,false +__ct__Q264JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>11MemoryChunkFPQ264JASMemChunkPool<1024,Q217JASThreadingModel19ObjectLevelLockable>11MemoryChunk,JASTaskThread.o,JAudio2.a,false getThreadPointer__6JASDvdFv,JASDvdThread.o,JAudio2.a,false createThread__6JASDvdFliUl,JASDvdThread.o,JAudio2.a,false regist__14JASCallbackMgrFPFPv_lPv,JASCallback.o,JAudio2.a,false @@ -116,35 +116,35 @@ noteOff__Q28JASTrack11TChannelMgrFUlUs,JASTrack.o,JAudio2.a,true setPauseFlag__Q28JASTrack11TChannelMgrFb,JASTrack.o,JAudio2.a,true __sinit_\JASTrack_cpp,JASTrack.o,JAudio2.a,true __ct__Q27JGadget13TLinkListNodeFv,JASTrack.o,JAudio2.a,true -Push_back__Q27JGadget25TLinkList<8JASTrack,-584>FP8JASTrack,JASTrack.o,JAudio2.a,true -end__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false +Push_back__Q27JGadget25TLinkList<8JASTrack,-584>FP8JASTrack,JASTrack.o,JAudio2.a,true +end__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false end__Q27JGadget13TNodeLinkListFv,JASTrack.o,JAudio2.a,false __ct__Q37JGadget13TNodeLinkList8iteratorFPQ27JGadget13TLinkListNode,JASTrack.o,JAudio2.a,false -__ct__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFQ37JGadget13TNodeLinkList8iterator,JASTrack.o,JAudio2.a,false +__ct__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFQ37JGadget13TNodeLinkList8iterator,JASTrack.o,JAudio2.a,false __ct__Q37JGadget13TNodeLinkList8iteratorFRCQ37JGadget13TNodeLinkList8iterator,JASTrack.o,JAudio2.a,false -Insert__Q27JGadget25TLinkList<8JASTrack,-584>FQ37JGadget25TLinkList<8JASTrack,-584>8iteratorP8JASTrack,JASTrack.o,JAudio2.a,false -Element_toNode__Q27JGadget25TLinkList<8JASTrack,-584>FP8JASTrack,JASTrack.o,JAudio2.a,false -__ct__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFv,JASTrack.o,JAudio2.a,false +Insert__Q27JGadget25TLinkList<8JASTrack,-584>FQ37JGadget25TLinkList<8JASTrack,-584>8iteratorP8JASTrack,JASTrack.o,JAudio2.a,false +Element_toNode__Q27JGadget25TLinkList<8JASTrack,-584>FP8JASTrack,JASTrack.o,JAudio2.a,false +__ct__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFv,JASTrack.o,JAudio2.a,false __ct__Q37JGadget13TNodeLinkList8iteratorFv,JASTrack.o,JAudio2.a,false -begin__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false +begin__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false begin__Q27JGadget13TNodeLinkListFv,JASTrack.o,JAudio2.a,false getNext__Q27JGadget13TLinkListNodeCFv,JASTrack.o,JAudio2.a,false -__as__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFRCQ37JGadget25TLinkList<8JASTrack,-584>8iterator,JASTrack.o,JAudio2.a,false -__as__Q27JGadget79TIteratorFRCQ27JGadget79TIterator,JASTrack.o,JAudio2.a,false -__as__Q23std78iteratorFRCQ23std78iterator,JASTrack.o,JAudio2.a,false -__pp__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFv,JASTrack.o,JAudio2.a,false +__as__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFRCQ37JGadget25TLinkList<8JASTrack,-584>8iterator,JASTrack.o,JAudio2.a,false +__as__Q27JGadget79TIteratorFRCQ27JGadget79TIterator,JASTrack.o,JAudio2.a,false +__as__Q23std78iteratorFRCQ23std78iterator,JASTrack.o,JAudio2.a,false +__pp__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorFv,JASTrack.o,JAudio2.a,false __pp__Q37JGadget13TNodeLinkList8iteratorFv,JASTrack.o,JAudio2.a,false -__rf__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorCFv,JASTrack.o,JAudio2.a,false +__rf__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorCFv,JASTrack.o,JAudio2.a,false __rf__Q37JGadget13TNodeLinkList8iteratorCFv,JASTrack.o,JAudio2.a,false -Element_toValue__Q27JGadget25TLinkList<8JASTrack,-584>FPQ27JGadget13TLinkListNode,JASTrack.o,JAudio2.a,false -__ml__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorCFv,JASTrack.o,JAudio2.a,false -Remove__Q27JGadget25TLinkList<8JASTrack,-584>FP8JASTrack,JASTrack.o,JAudio2.a,false -__ne__7JGadgetFQ37JGadget25TLinkList<8JASTrack,-584>8iteratorQ37JGadget25TLinkList<8JASTrack,-584>8iterator,JASTrack.o,JAudio2.a,false -__eq__7JGadgetFQ37JGadget25TLinkList<8JASTrack,-584>8iteratorQ37JGadget25TLinkList<8JASTrack,-584>8iterator,JASTrack.o,JAudio2.a,false +Element_toValue__Q27JGadget25TLinkList<8JASTrack,-584>FPQ27JGadget13TLinkListNode,JASTrack.o,JAudio2.a,false +__ml__Q37JGadget25TLinkList<8JASTrack,-584>8iteratorCFv,JASTrack.o,JAudio2.a,false +Remove__Q27JGadget25TLinkList<8JASTrack,-584>FP8JASTrack,JASTrack.o,JAudio2.a,false +__ne__7JGadgetFQ37JGadget25TLinkList<8JASTrack,-584>8iteratorQ37JGadget25TLinkList<8JASTrack,-584>8iterator,JASTrack.o,JAudio2.a,false +__eq__7JGadgetFQ37JGadget25TLinkList<8JASTrack,-584>8iteratorQ37JGadget25TLinkList<8JASTrack,-584>8iterator,JASTrack.o,JAudio2.a,false __eq__7JGadgetFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator,JASTrack.o,JAudio2.a,false -__ct__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false +__ct__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false __ct__Q27JGadget13TNodeLinkListFv,JASTrack.o,JAudio2.a,false -__dt__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false +__dt__Q27JGadget25TLinkList<8JASTrack,-584>Fv,JASTrack.o,JAudio2.a,false __dt__Q28JASTrack5TListFv,JASTrack.o,JAudio2.a,false __dl__58JASPoolAllocObject_MultiThreadedFPvUl,JASTrack.o,JAudio2.a,false free__50JASMemPool_MultiThreadedFPvUl,JASTrack.o,JAudio2.a,false @@ -158,7 +158,7 @@ __ct__Q317JASThreadingModel71InterruptsDisable<50JASMemPool_MultiThreaded>4LockFRC35JASMemPool_MultiThreaded<8JASTrack>,JASTrack.o,JAudio2.a,false __ct__18JASCriticalSectionFv,JASTrack.o,JAudio2.a,false get__21JASPtrTable<7JASBank>CFUl,JASTrack.o,JAudio2.a,false -__ct__25JASPtrArray<7JASBank,256>Fv,JASTrack.o,JAudio2.a,false +__ct__25JASPtrArray<7JASBank,256>Fv,JASTrack.o,JAudio2.a,false __ct__21JASPtrTable<7JASBank>FPP7JASBankUl,JASTrack.o,JAudio2.a,false __ct__40JASGlobalInstance<19JASDefaultBankTable>Fb,JASTrack.o,JAudio2.a,false __dt__40JASGlobalInstance<19JASDefaultBankTable>Fv,JASTrack.o,JAudio2.a,false @@ -455,7 +455,7 @@ mixMonoTrackWide__9JASDriverFPsUlPFl_Ps,JASAiCtrl.o,JAudio2.a,false mixExtraTrack__9JASDriverFPsUlPFl_Ps,JASAiCtrl.o,JAudio2.a,false mixInterleaveTrack__9JASDriverFPsUlPFl_Ps,JASAiCtrl.o,JAudio2.a,false getSubFrameCounter__9JASDriverFv,JASAiCtrl.o,JAudio2.a,false -clamp__7JASCalcFl_s,JASAiCtrl.o,JAudio2.a,false +clamp__7JASCalcFl_s,JASAiCtrl.o,JAudio2.a,false create__14JASAudioThreadFl,JASAudioThread.o,JAudio2.a,false stop__14JASAudioThreadFv,JASAudioThread.o,JAudio2.a,false run__14JASAudioThreadFv,JASAudioThread.o,JAudio2.a,false @@ -876,11 +876,11 @@ getData__13JAUSoundTableCF10JAISoundID,JAUSoundTable.o,JAudio2.a,false getNumGroups_inSection__17JAUSoundNameTableCFUc,JAUSoundTable.o,JAudio2.a,false getNumItems_inGroup__17JAUSoundNameTableCFUcUc,JAUSoundTable.o,JAudio2.a,false init__17JAUSoundNameTableFPCv,JAUSoundTable.o,JAudio2.a,false -getSection__81JAUSoundTable_<17JAUSoundTableRoot,20JAUSoundTableSection,18JAUSoundTableGroup,v>CFi,JAUSoundTable.o,JAudio2.a,false -getGroup__81JAUSoundTable_<17JAUSoundTableRoot,20JAUSoundTableSection,18JAUSoundTableGroup,v>CFPC20JAUSoundTableSectioni,JAUSoundTable.o,JAudio2.a,false -getSection__93JAUSoundTable_<21JAUSoundNameTableRoot,24JAUSoundNameTableSection,22JAUSoundNameTableGroup,c>CFi,JAUSoundTable.o,JAudio2.a,false -getGroup__93JAUSoundTable_<21JAUSoundNameTableRoot,24JAUSoundNameTableSection,22JAUSoundNameTableGroup,c>CFPC24JAUSoundNameTableSectioni,JAUSoundTable.o,JAudio2.a,false -getItem__93JAUSoundTable_<21JAUSoundNameTableRoot,24JAUSoundNameTableSection,22JAUSoundNameTableGroup,c>CFPC22JAUSoundNameTableGroupi,JAUSoundTable.o,JAudio2.a,false +getSection__81JAUSoundTable_<17JAUSoundTableRoot,20JAUSoundTableSection,18JAUSoundTableGroup,v>CFi,JAUSoundTable.o,JAudio2.a,false +getGroup__81JAUSoundTable_<17JAUSoundTableRoot,20JAUSoundTableSection,18JAUSoundTableGroup,v>CFPC20JAUSoundTableSectioni,JAUSoundTable.o,JAudio2.a,false +getSection__93JAUSoundTable_<21JAUSoundNameTableRoot,24JAUSoundNameTableSection,22JAUSoundNameTableGroup,c>CFi,JAUSoundTable.o,JAudio2.a,false +getGroup__93JAUSoundTable_<21JAUSoundNameTableRoot,24JAUSoundNameTableSection,22JAUSoundNameTableGroup,c>CFPC24JAUSoundNameTableSectioni,JAUSoundTable.o,JAudio2.a,false +getItem__93JAUSoundTable_<21JAUSoundNameTableRoot,24JAUSoundNameTableSection,22JAUSoundNameTableGroup,c>CFPC22JAUSoundNameTableGroupi,JAUSoundTable.o,JAudio2.a,false getName__17JAUSoundNameTableCF10JAISoundID,JAUSoundTable.o,JAudio2.a,false getBgmSeqResourceID__15JAUStdSoundInfoCF10JAISoundID,JAUStdSoundInfo.o,JAudio2.a,false getSoundType__15JAUStdSoundInfoCF10JAISoundID,JAUStdSoundInfo.o,JAudio2.a,false diff --git a/libs/JSystem/csv/JMath.csv b/libs/JSystem/csv/JMath.csv index 6c076829..62036450 100644 --- a/libs/JSystem/csv/JMath.csv +++ b/libs/JSystem/csv/JMath.csv @@ -5,9 +5,9 @@ JMAVECScaleAdd__FPC3VecPC3VecP3Vecf,JMath.o,JMath.a,false JMAVECLerp__FPC3VecPC3VecP3Vecf,JMath.o,JMath.a,false JMAMTXApplyScale__FPA4_CfPA4_ffff,JMath.o,JMath.a,false __ct__Q25JMath13TRandom_fast_FUl,random.o,JMath.a,true -atan2___Q25JMath18TAtanTable<1024,f>CFff,JMATrigonometric.o,JMath.a,false +atan2___Q25JMath18TAtanTable<1024,f>CFff,JMATrigonometric.o,JMath.a,false __sinit_\JMATrigonometric_cpp,JMATrigonometric.o,JMath.a,false -get___Q25JMath18TAtanTable<1024,f>CFff,JMATrigonometric.o,JMath.a,false -__ct__Q25JMath18TSinCosTable<14,f>Fv,JMATrigonometric.o,JMath.a,false -__ct__Q25JMath18TAtanTable<1024,f>Fv,JMATrigonometric.o,JMath.a,false -__ct__Q25JMath22TAsinAcosTable<1024,f>Fv,JMATrigonometric.o,JMath.a,false +get___Q25JMath18TAtanTable<1024,f>CFff,JMATrigonometric.o,JMath.a,false +__ct__Q25JMath18TSinCosTable<14,f>Fv,JMATrigonometric.o,JMath.a,false +__ct__Q25JMath18TAtanTable<1024,f>Fv,JMATrigonometric.o,JMath.a,false +__ct__Q25JMath22TAsinAcosTable<1024,f>Fv,JMATrigonometric.o,JMath.a,false diff --git a/libs/JSystem/csv/JUtility.csv b/libs/JSystem/csv/JUtility.csv index 6cebce42..e43e33dd 100644 --- a/libs/JSystem/csv/JUtility.csv +++ b/libs/JSystem/csv/JUtility.csv @@ -110,5 +110,5 @@ JUTReportConsole,JUTConsole.o,JUtility.a,false JUTWarningConsole_f_va,JUTConsole.o,JUtility.a,false getLinePtr__10JUTConsoleCFi,JUTConsole.o,JUtility.a,false drawString_scale__7JUTFontFffffPCcb,JUTConsole.o,JUtility.a,false -end__Q27JGadget27TLinkList<10JUTConsole,-24>Fv,JUTConsole.o,JUtility.a,false -begin__Q27JGadget27TLinkList<10JUTConsole,-24>Fv,JUTConsole.o,JUtility.a,false +end__Q27JGadget27TLinkList<10JUTConsole,-24>Fv,JUTConsole.o,JUtility.a,false +begin__Q27JGadget27TLinkList<10JUTConsole,-24>Fv,JUTConsole.o,JUtility.a,false