encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

decompile s_basic, cleanup mangled names in f_pc (#101)

Browse Source 
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-01-26 17:11:50 -05:00
committed by GitHub
co-authored by Pheenoh
parent 3ee8a929a9
commit ce0d0c3521
9 changed files with 46 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f/f_pc/f_pc_base.cpp
+6 -6
View File
@@ -1,5 +1,7 @@
#include "f/f_pc/f_pc_base.h"
#include "SComponent/c_malloc.h"
#include "SComponent/c_phase.h"
#include "SStandard/s_basic.h"
#include "dolphin/types.h"
#include "f/f_pc/f_pc_delete_tag.h"
#include "f/f_pc/f_pc_layer.h"
@@ -18,8 +20,6 @@ extern s32 lbl_80450D00; // f_pc_base::g_fpcBs_type
extern "C" {
extern void sBs_ClearArea(void* pPtr, s32 pSize);
BOOL fpcBs_Is_JustOfType(s32 pType1, s32 pType2) {
return checkEqual(pType1, pType2);
}
@@ -54,7 +54,7 @@ s32 fpcBs_Execute(base_process_class* pProc) {
void fpcBs_DeleteAppend(base_process_class* pProc) {
if (pProc->mpUserData != NULL) {
free__3cMlFPv(pProc->mpUserData);
cMl::free(pProc->mpUserData);
pProc->mpUserData = NULL;
}
}
@@ -73,7 +73,7 @@ s32 fpcBs_Delete(base_process_class* pProc) {
if (deleteResult == 1) {
fpcBs_DeleteAppend(pProc);
pProc->mBsType = 0;
free__3cMlFPv(pProc);
cMl::free(pProc);
}
return deleteResult;
}
@@ -81,11 +81,11 @@ s32 fpcBs_Delete(base_process_class* pProc) {
base_process_class* fpcBs_Create(s16 pProcTypeID, u32 pProcID, void* pData) {
process_profile_definition* procProfDef;
base_process_class* procClass;
s32 size;
u32 size;
procProfDef = fpcPf_Get(pProcTypeID);
size = procProfDef->mSize + procProfDef->mSizeOther;
procClass = (base_process_class*)memalignB__3cMlFiUl(-4, size);
procClass = (base_process_class*)cMl::memalignB(-4, size);
if (procClass == NULL) {
return NULL;
} else {
src/f/f_pc/f_pc_create_req.cpp
+3 -4
View File
@@ -1,5 +1,6 @@
#include "dolphin/types.h"
#include "SComponent/c_malloc.h"
#include "SComponent/c_phase.h"
#include "f/f_pc/f_pc_base.h"
#include "f/f_pc/f_pc_create_iter.h"
@@ -32,8 +33,6 @@ void fpcCtRq_ToCreateQ(create_request* pReq) {
fpcCtTg_ToCreateQ(&pReq->mBase.mBase);
}
extern void free__3cMlFPv(void* pPtr);
BOOL fpcCtRq_Delete(create_request* pReq) {
fpcCtRq_CreateQTo(pReq);
if (pReq->mpCtRqMtd != NULL && fpcMtd_Method(pReq->mpCtRqMtd->mpDelete, pReq) == 0) {
@@ -42,7 +41,7 @@ BOOL fpcCtRq_Delete(create_request* pReq) {
if (pReq->mpRes) {
pReq->mpRes->mpCtRq = NULL;
}
free__3cMlFPv(pReq);
cMl::free(pReq);
return 1;
}
}
@@ -105,7 +104,7 @@ void fpcCtRq_Handler(void) {
}
create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, create_request_method_class* pMthd) {
create_request* pReq = (create_request*)memalignB__3cMlFiUl(-4, size);
create_request* pReq = (create_request*)cMl::memalignB(-4, size);
if (pReq != NULL) {
fpcCtTg_Init(&pReq->mBase, pReq);
src/f/f_pc/f_pc_node_req.cpp
+8 -21
View File
@@ -1,4 +1,6 @@
#include "f/f_pc/f_pc_node_req.h"
#include "SComponent/c_malloc.h"
#include "SStandard/s_basic.h"
#include "dolphin/types.h"
#include "f/f_pc/f_pc_base.h"
#include "f/f_pc/f_pc_create_req.h"
@@ -6,6 +8,7 @@
#include "f/f_pc/f_pc_deletor.h"
#include "f/f_pc/f_pc_executor.h"
#include "f/f_pc/f_pc_layer.h"
#include "f/f_pc/f_pc_stdcreate_req.h"
// f_pc_node_req::l_fpcNdRq_Queue
extern node_list_class lbl_803A3A38;
@@ -23,9 +26,6 @@ extern s8 lbl_80450D4C;
extern "C" {
extern s32 fpcSCtRq_Request(layer_class*, s16, process_method_func, void*, void*);
extern void sBs_ClearArea(void* pPtr, s32 pSize);
void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq) {
fpcLy_CreatedMesg(pNodeCreateReq->mpLayerClass);
fpcLy_CancelQTo(&pNodeCreateReq->mProcMthCls);
@@ -49,8 +49,8 @@ s32 fpcNdRq_phase_IsCreated(node_create_request* pNodeCreateReq) {
s32 fpcNdRq_phase_Create(node_create_request* pNodeCreateReq) {
pNodeCreateReq->mCreatingID =
fpcSCtRq_Request(pNodeCreateReq->mpLayerClass, pNodeCreateReq->mProcName,
pNodeCreateReq->mpNodeCrReqMthCls->mpPostMethodFunc, pNodeCreateReq,
pNodeCreateReq->mpUserData);
(stdCreateFunc)pNodeCreateReq->mpNodeCrReqMthCls->mpPostMethodFunc,
pNodeCreateReq, pNodeCreateReq->mpUserData);
return pNodeCreateReq->mCreatingID == -1 ? 3 : 2;
}
@@ -104,7 +104,7 @@ s32 fpcNdRq_Delete(node_create_request* pNodeCreateReq) {
fpcMtd_Method(pNodeCreateReq->mpNodeCrReqMthCls->mpUnkFunc, pNodeCreateReq) == 0) {
return 0;
}
free__3cMlFPv(pNodeCreateReq);
cMl::free(pNodeCreateReq);
return 1;
}
@@ -175,8 +175,8 @@ s32 fpcNdRq_IsIng(process_node_class* pProcNode) {
return 0;
}
node_create_request* fpcNdRq_Create(s32 pRequestSize) {
node_create_request* req = (node_create_request*)memalignB__3cMlFiUl(-4, pRequestSize);
node_create_request* fpcNdRq_Create(u32 pRequestSize) {
node_create_request* req = (node_create_request*)cMl::memalignB(-4, pRequestSize);
if (req != NULL) {
if (lbl_80450D4C == 0) {
lbl_80450D48 = 0;
@@ -184,19 +184,6 @@ node_create_request* fpcNdRq_Create(s32 pRequestSize) {
}
sBs_ClearArea(req, pRequestSize);
*req = lbl_803A3A44;
// req->mCreateTag = lbl_803A3A44.mCreateTag;
// req->mProcMthCls = lbl_803A3A44.mProcMthCls;
// req->mReqPhsProc = lbl_803A3A44.mReqPhsProc;
// req->mpPhsHandler = lbl_803A3A44.mpPhsHandler;
// req->mpNodeCrReqMthCls = lbl_803A3A44.mpNodeCrReqMthCls;
// req->mParameter = lbl_803A3A44.mParameter;
// req->mRequestId = lbl_803A3A44.mRequestId;
// req->mNodeProc = lbl_803A3A44.mNodeProc;
// req->mpLayerClass = lbl_803A3A44.mpLayerClass;
// req->mCreatingID = lbl_803A3A44.mCreatingID;
// req->mProcName = lbl_803A3A44.mProcName;
// req->mpUserData = lbl_803A3A44.mpUserData;
// req->unk_0x60 = lbl_803A3A44.unk_0x60;
cTg_Create(&req->mCreateTag, req);
fpcMtdTg_Init(&req->mProcMthCls, (process_method_tag_func)fpcNdRq_Cancel, req);
req->mRequestId = lbl_80450D48++;