falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

m_Do cleanup and c_dylink process names

This commit is contained in:
jdflyer 2023-02-13 21:18:12 +00:00
parent d5f5d4c3b3
commit 5e83813372
23 changed files with 862 additions and 963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/DynamicLink.h
View File

@ -17,7 +17,8 @@ struct DynamicModuleControlBase {
/* 800188DC */ virtual const char* getModuleName() const { return NULL; };
/* 80263210 */ virtual int getModuleSize() const;
/* 80263200 */ virtual const char* getModuleTypeString() const;
/* 80262470 */ virtual void dump();
virtual void dump();
/* 80262470 */ static void dump();
/* 802631FC */ virtual void dump2();
/* 802631DC */ virtual bool do_load();
/* 802631F4 */ virtual BOOL do_load_async();

2
include/d/com/d_com_inf_game.h
View File

@ -2801,7 +2801,7 @@ inline view_class* dComIfGd_getView() {
}
inline Mtx44* dComIfGd_getProjViewMtx() {
return &(((camera_class*)g_dComIfG_gameInfo.drawlist.getView())->mProjViewMtx);
return &(g_dComIfG_gameInfo.drawlist.getView()->mProjViewMtx);
}
inline view_port_class* dComIfGd_getViewport() {

3
include/f_op/f_op_camera_mng.h
View File

@ -12,9 +12,6 @@
class camera_process_class : public view_class {
public:
/* 0x170 */ Mtx mInvViewMtx;
/* 0x1A0 */ Mtx44 mProjViewMtx;
/* 0x1E0 */ Mtx mViewMtxNoTrans;
/* 0x210 */ create_tag_class mCreateTag;
/* 0x224 */ leafdraw_method_class* mpMtd;
/* 0x228 */ u8 field_0x228[4];

3
include/f_op/f_op_view.h
View File

@ -48,6 +48,9 @@ struct view_class : public leafdraw_class {
/* 0x0FC */ s16 mBank;
/* 0x100 */ Mtx44 mProjMtx;
/* 0x140 */ Mtx mViewMtx;
/* 0x170 */ Mtx mInvViewMtx;
/* 0x1A0 */ Mtx44 mProjViewMtx;
/* 0x1E0 */ Mtx mViewMtxNoTrans;
};
#endif

2
include/m_Do/m_Do_dvd_thread.h
View File

@ -58,7 +58,7 @@ private:
class mDoDvdThd_mountXArchive_c : public mDoDvdThd_command_c {
public:
/* 80016108 */ virtual ~mDoDvdThd_mountXArchive_c();
/* 80016168 */ mDoDvdThd_mountXArchive_c(u8, JKRArchive::EMountMode);
/* 80016168 */ mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchive::EMountMode mountMode);
/* 800161E0 */ static mDoDvdThd_mountXArchive_c* create(char const*, u8, JKRArchive::EMountMode,
JKRHeap*);
/* 800162B0 */ virtual s32 execute();

1
include/m_Do/m_Do_ext.h
View File

@ -519,6 +519,7 @@ void mDoExt_setAraCacheSize(u32 size);
int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
void mDoExt_modelEntryDL(J3DModel* i_model);
void mDoExt_setupStageTexture(J3DModelData* i_modelData);
OSThread* mDoExt_GetCurrentRunningThread();
struct JUTFont;
JUTFont* mDoExt_getMesgFont();

23
rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp
View File

@ -1,24 +1,13 @@
//
// Generated By: dol2asm
// Translation Unit: f_pc_profile_lst
//
/**
* f_pc_profile_lst.cpp
* Global Profile List
*/
#include "rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "f_pc/f_pc_leaf.h"
//
// Forward References:
//
extern "C" void ModuleProlog();
extern "C" void ModuleEpilog();
//
// External References:
//
extern "C" extern void* g_profile_ALINK[12 + 9 /* padding */];
extern "C" extern void* g_profile_NO_CHG_ROOM[12];
extern "C" extern void* g_profile_ITEM[12];
@ -1614,11 +1603,11 @@ SECTION_DATA static process_profile_definition* g_fpcPfLst_ProfileList[793] = {
};
/* 80456C58-80456C6C 000078 0014+00 0/0 1/1 0/0 .text ModuleProlog */
void ModuleProlog() {
extern "C" void ModuleProlog() {
g_fpcPf_ProfileList_p = g_fpcPfLst_ProfileList;
}
/* 80456C6C-80456C7C 00008C 0010+00 0/0 1/1 0/0 .text ModuleEpilog */
void ModuleEpilog() {
extern "C" void ModuleEpilog() {
g_fpcPf_ProfileList_p = NULL;
}

8
src/DynamicLink.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: DynamicLink
//
/**
* DynamicLink.cpp
* REL Linking Manager
*/
#include "DynamicLink.h"
#include "JSystem/JKernel/JKRDvdRipper.h"

1524
src/c/c_dylink.cpp
View File

File diff suppressed because it is too large Load Diff

13
src/m_Do/m_Do_DVDError.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_DVDError
//
/**
* m_Do_DVDError.cpp
* DVD Error Handling
*/
#include "m_Do/m_Do_DVDError.h"
#include "dol2asm.h"
@ -10,11 +10,6 @@
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_Reset.h"
//
// Declarations:
//
/* ############################################################################################## */
/* 803DECC0-803DEFE0 00B9E0 0318+08 4/4 0/0 0/0 .bss DvdErr_thread */
static OSThread DvdErr_thread;

2
src/m_Do/m_Do_MemCard.cpp
View File

@ -502,5 +502,3 @@ static int mDoMemCd_main(void*) {
g_mDoMemCd_control.main();
return 0;
}
/* 803743F8-803743F8 000A58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

8
src/m_Do/m_Do_MemCardRWmng.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_MemCardRWmng
//
/**
* m_Do_MemCardRWmng.cpp
* Memcard Saving and Checksum
*/
#include "m_Do/m_Do_MemCardRWmng.h"
#include "MSL_C/MSL_Common/Src/printf.h"

18
src/m_Do/m_Do_Reset.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_Reset
//
/**
* m_Do_Reset.cpp
* Game Reset Management
*/
#include "m_Do/m_Do_Reset.h"
#include "JSystem/JAudio2/JASDvdThread.h"
@ -51,13 +51,7 @@ extern "C" u8 sCallback__Q210JUTGamePad13C3ButtonReset[4];
extern "C" u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */];
extern "C" u8 sManager__6JUTXfb[4 + 4 /* padding */];
//
// Declarations:
//
static void my_OSCancelAlarmAll() {
/* empty function */
}
static void my_OSCancelAlarmAll() {}
static void destroyVideo() {
JUTVideo::destroyManager();
@ -184,5 +178,3 @@ u8 struct_80450C87;
/* 80450C88-80450C90 000188 0008+00 0/0 2/2 0/0 .sbss None */
bool mDoDvdErr_initialized;
/* 80374198-80374198 0007F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

8
src/m_Do/m_Do_audio.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_audio
//
/**
* m_Do_audio.cpp
* Audio Management Functions
*/
#include "m_Do/m_Do_audio.h"
#include "d/com/d_com_inf_game.h"

13
src/m_Do/m_Do_controller_pad.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_controller_pad
//
/**
* m_Do_controller_pad.cpp
* JUTGamePad Wrapper and Conversion
*/
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_main.h"
@ -10,11 +10,6 @@
#include "dolphin/types.h"
#include "f_ap/f_ap_game.h"
//
// Declarations:
//
/* ############################################################################################## */
/* 803DD2D8-803DD2E8 009FF8 0010+00 2/2 6/6 0/0 .bss m_gamePad__8mDoCPd_c */
JUTGamePad* mDoCPd_c::m_gamePad[4];

39
src/m_Do/m_Do_dvd_thread.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_dvd_thread
//
/**
* m_Do_dvd_thread.cpp
* DVD Thread Manager
*/
#include "m_Do/m_Do_dvd_thread.h"
#include "JSystem/JKernel/JKRDvdRipper.h"
@ -13,22 +13,8 @@
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_Reset.h"
//
// Types:
//
struct JASTaskThread {
/* 8028FB5C */ void sendCmdMsg(void (*)(void*), void const*, u32);
};
struct JASDvd {
static JASTaskThread* getThreadPointer();
};
//
// Declarations:
//
#include "JSystem/JAudio2/JASDvdThread.h"
#include "JSystem/JAudio2/JASTaskThread.h"
/* 800157FC-80015858 01013C 005C+00 1/1 0/1 0/0 .text main__9mDoDvdThdFPv */
s32 mDoDvdThd::main(void* param_0) {
@ -38,7 +24,6 @@ s32 mDoDvdThd::main(void* param_0) {
return 0;
}
/* ############################################################################################## */
/* 803DD940-803DDC60 00A660 0318+08 2/2 0/0 0/0 .bss l_thread__9mDoDvdThd */
OSThread mDoDvdThd::l_thread;
@ -50,7 +35,7 @@ mDoDvdThd_param_c mDoDvdThd::l_param;
#pragma push
#pragma force_active on
u8 padding[0x18];
static u8 padding[0x18];
#pragma pop
/* 80015858-800158B4 010198 005C+00 0/0 1/1 0/0 .text create__9mDoDvdThdFl */
@ -268,13 +253,13 @@ mDoDvdThd_mountXArchive_c::~mDoDvdThd_mountXArchive_c() {}
/* 80016168-800161E0 010AA8 0078+00 1/1 0/0 0/0 .text
* __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode */
mDoDvdThd_mountXArchive_c::mDoDvdThd_mountXArchive_c(u8 param_0, JKRArchive::EMountMode param_1) {
mMountDirection = param_0;
mDoDvdThd_mountXArchive_c::mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchive::EMountMode mountMode) {
mMountDirection = mountDirection;
mEntryNum = -1;
mArchive = NULL;
mMountMode = param_1;
mMountMode = mountMode;
mHeap = NULL;
if (param_0 == 0) {
if (mountDirection == 0) {
mMountDirection = sDefaultDirection;
}
}
@ -364,7 +349,6 @@ s32 mDoDvdThd_toMainRam_c::execute() {
return mData != NULL;
}
/* ############################################################################################## */
/* 80374357-8037438B 0009B7 0034+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
@ -395,4 +379,3 @@ SECTION_DEAD static char const* const stringBase_803743C1 =
"\xBE\x82"
"\xC9\x8E\xB8\x94\x73\x0A";
#pragma pop
/* 803741A8-803741A8 000808 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

8
src/m_Do/m_Do_ext.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_ext
//
/**
* m_Do_ext.cpp
* Model, Animation, and Heap Functions
*/
#include "m_Do/m_Do_ext.h"
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"

36
src/m_Do/m_Do_graphic.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_graphic
//
/**
* m_Do_graphic.cpp
* Graphics Management Functions
*/
#include "m_Do/m_Do_graphic.h"
#include "JSystem/JFramework/JFWSystem.h"
@ -162,22 +162,24 @@ extern "C" u8 sManager__10JUTProcBar[4];
// extra mr optimized out?
#ifdef NONMATCHING
static ResTIMG* createTimg(u16 width, u16 height, u32 format) {
u32 buf_size = GXGetTexBufferSize(width, height, format, GX_FALSE, 0) + 0x20;
ResTIMG* timg = (ResTIMG*)JKRHeap::alloc(buf_size, 0x20, NULL);
u32 bufferSize = GXGetTexBufferSize(width, height, format, GX_FALSE, 0) + 0x20;
ResTIMG* timg;
timg = (ResTIMG*)JKRHeap::alloc(bufferSize, 0x20, NULL);
if (timg == NULL) {
if (timg==NULL) {
return NULL;
} else {
cLib_memSet(timg, 0, buf_size);
timg->format = format;
timg->alphaEnabled = false;
timg->width = width;
timg->height = height;
timg->minFilter = GX_LINEAR;
timg->magFilter = GX_LINEAR;
timg->mipmapCount = 1;
timg->imageOffset = 0x20;
}
cLib_memSet(timg, 0, bufferSize);
timg->format = format;
timg->alphaEnabled = false;
timg->width = width;
timg->height = height;
timg->minFilter = GX_LINEAR;
timg->magFilter = GX_LINEAR;
timg->mipmapCount = 1;
timg->imageOffset = 0x20;
return timg;
}
#else

10
src/m_Do/m_Do_machine.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_machine
//
/**
* m_Do_machine.cpp
* Exception Management
*/
#include "m_Do/m_Do_machine.h"
#include "JSystem/JFramework/JFWSystem.h"
@ -761,5 +761,3 @@ asm int mDoMch_Create() {
}
#pragma pop
#endif
/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

36
src/m_Do/m_Do_machine_exception.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_machine_exception
//
/**
* m_Do_machine_exception.cpp
* Exception Print Functions
*/
#include "m_Do/m_Do_machine_exception.h"
#include "JSystem/JFramework/JFWSystem.h"
@ -13,32 +13,10 @@
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_main.h"
//
// Types:
//
struct DynamicModuleControlBase {
/* 80262470 */ void dump();
};
//
// External References:
//
extern "C" void dump__24DynamicModuleControlBaseFv();
//
// Declarations:
//
#include "DynamicLink.h"
static JUTConsole* sConsole;
#pragma push
#pragma force_active on
u8 struct_80450C94[4];
#pragma pop
void print_f(char const* fmt, ...) {
va_list args;
va_start(args, fmt);
@ -73,7 +51,7 @@ void dispHeapInfo() {
if (JKRAram::getAramHeap()) {
JKRAram::getAramHeap()->dump();
}
dump__24DynamicModuleControlBaseFv();
DynamicModuleControlBase::dump();
g_dComIfG_gameInfo.mResControl.dump();
zelda->dump_sort();
@ -120,5 +98,3 @@ void exception_addition(JUTConsole* pConsole) {
dispConsoleToTerminal();
dispGameInfo();
}
/* 80374460-80374460 000AC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

8
src/m_Do/m_Do_main.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_main
//
/**
* m_Do_main.cpp
* Main Initialization
*/
#include "m_Do/m_Do_main.h"
#include "DynamicLink.h"

8
src/m_Do/m_Do_mtx.cpp
View File

@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: m_Do/m_Do_mtx
//
/**
* m_Do_mtx.cpp
* Matrix Helper Functions
*/
#include "m_Do/m_Do_mtx.h"
#include "dol2asm.h"

49
src/m_Do/m_Do_printf.cpp
View File

@ -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 */