diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-07-08 14:41:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-08 14:41:25 -0400 |
| commit | b3eae0e5b7bcc2c5d3c8a1d562f0737d80c7e35c (patch) | |
| tree | c624812b382933564882fa4492921b7ea28c36ba /tools | |
| parent | a506e8620ae8f428ae625644aa5b8d540867641f (diff) | |
Port OoT's docs for `fault.c` and `fault_drawer.c` (#1199)
* fault.h
* some docs stealing
* fix building
* fault_internal.h
* pass
* finish stealing docs
* finish cleanup
* format
* warning
* Update src/boot_O2_g3/fault.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/boot_O2_g3/fault.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/boot_O2_g3/fault.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* arggggg
* arggggg part 2
* STACK
* PHYS_TO_K0(0x400000)
* format
* fix
* Instance
* format
* Neutral reset
* variables.h cleanup
* bss
* frameBuffer
* format
* Update src/boot_O2_g3/fault.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/boot_O2_g3/fault.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* bss
* bss
* bss
* callback cleanup
* fix function declarations
* fix again
* bss
* bss
* Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/boot_O2_g3/fault.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* bss
* bss
* Update src/boot_O2_g3/fault.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
* import bss
* format
* minor cleanup
* bss
* review
* fix
* bss
* bss
* bss
* bss
* bss
* format
* a
* Z_PRIORITY_FAULT
* bss
* fix
* idle.c bss doesn't want to get fixed :c
* review
* bss
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/disasm/functions.txt | 20 | ||||
| -rw-r--r-- | tools/disasm/variables.txt | 12 | ||||
| -rwxr-xr-x | tools/namefixer.py | 2 | ||||
| -rw-r--r-- | tools/sizes/boot_functions.csv | 20 |
4 files changed, 28 insertions, 26 deletions
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index b56253e41..557c278c7 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -65,27 +65,27 @@ 0x8008212C:("Fault_FillScreenRed",), 0x80082180:("Fault_DrawCornerRec",), 0x800821D4:("Fault_PrintFReg",), - 0x80082280:("osSyncPrintfFReg",), + 0x80082280:("Fault_LogFReg",), 0x80082330:("Fault_PrintFPCR",), - 0x800823D4:("osSyncPrintfFPCR",), + 0x800823D4:("Fault_LogFPCSR",), 0x8008246C:("Fault_PrintThreadContext",), 0x800827BC:("osSyncPrintfThreadContext",), 0x80082AB8:("Fault_FindFaultedThread",), 0x80082B40:("Fault_Wait5Seconds",), 0x80082BD0:("Fault_WaitForButtonCombo",), - 0x80082C6C:("Fault_DrawMemDumpPage",), + 0x80082C6C:("Fault_DrawMemDumpContents",), 0x80082DD8:("Fault_DrawMemDump",), - 0x80082FD0:("Fault_FindNextStackCall",), + 0x80082FD0:("Fault_WalkStack",), 0x80083144:("Fault_DrawStackTrace",), - 0x800832D4:("osSyncPrintfStackTrace",), + 0x800832D4:("Fault_LogStackTrace",), 0x80083450:("Fault_ResumeThread",), - 0x800834CC:("Fault_CommitFB",), + 0x800834CC:("Fault_DisplayFrameBuffer",), 0x8008358C:("Fault_ProcessClients",), 0x80083670:("Fault_SetOptionsFromController3",), - 0x800837E4:("Fault_SetOptions",), + 0x800837E4:("Fault_UpdatePad",), 0x80083828:("Fault_ThreadEntry",), - 0x80083B70:("Fault_SetFB",), - 0x80083BC4:("Fault_Start",), + 0x80083B70:("Fault_SetFrameBuffer",), + 0x80083BC4:("Fault_Init",), 0x80083CF8:("Fault_HangupFaultClient",), 0x80083DF4:("Fault_AddHungupAndCrashImpl",), 0x80083E4C:("Fault_AddHungupAndCrash",), @@ -104,7 +104,7 @@ 0x8008477C:("FaultDrawer_VPrintf",), 0x800847CC:("FaultDrawer_Printf",), 0x8008481C:("FaultDrawer_DrawText",), - 0x8008486C:("FaultDrawer_SetDrawerFB",), + 0x8008486C:("FaultDrawer_SetDrawerFrameBuffer",), 0x800848A4:("FaultDrawer_SetInputCallback",), 0x800848B8:("FaultDrawer_Init",), 0x80084940:("func_80084940",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index 04d893310..9b61c54c7 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -25,7 +25,7 @@ 0x80096B78:("sIrqMgrRetraceCount","s32","",0x4), 0x80096B80:("sCpuExceptions","char*","[18]",0x48), 0x80096BC8:("sFpuExceptions","char*","[6]",0x18), - 0x80096BE0:("sFaultDrawContext","FaultDrawer*","",0x4), + 0x80096BE0:("sFaultDrawerInstance","FaultDrawer*","",0x4), 0x80096BE4:("sFaultDrawerDefault","FaultDrawer","",0x3c), 0x80096C20:("gLoadLogSeverity","UNK_TYPE4","",0x4), 0x80096C30:("gOverlayLogSeverity","UNK_TYPE4","",0x4), @@ -313,14 +313,14 @@ 0x8009BE30:("D_8009BE30","UNK_TYPE4","",0x4), 0x8009BE34:("D_8009BE34","UNK_TYPE4","",0x4), 0x8009BE38:("romInfoFaultClient","FaultClient","",0x10), - 0x8009BE50:("sFaultContext","FaultThreadStruct*","",0x4), - 0x8009BE54:("D_8009BE54","f32","",0x4), + 0x8009BE50:("sFaultInstance","FaultMgr*","",0x4), + 0x8009BE54:("sFaultTimeTotal","f32","",0x4), 0x8009BE58:("faultCustomOptions","u32","",0x4), 0x8009BE5C:("faultCopyToLog","u32","",0x4), 0x8009BE60:("sFaultStack","u8","[1536]",0x600), - 0x8009C460:("sFaultStackInfo","StackEntry","",0x1c), - 0x8009C480:("gFaultStruct","FaultThreadStruct","",0x848), - 0x8009CCD0:("sFaultDrawerStruct","FaultDrawer","",0x3c), + 0x8009C460:("sFaultStackInfo","StackEntry","",0x1C), + 0x8009C480:("gFaultMgr","FaultMgr","",0x848), + 0x8009CCD0:("sFaultDrawer","FaultDrawer","",0x3c), 0x8009CD10:("D_8009CD10","UNK_TYPE4","",0x4), 0x8009CD20:("gSystemArena","Arena","",0x24), 0x8009CD50:("sRandFloat","f32","",0x4), diff --git a/tools/namefixer.py b/tools/namefixer.py index 514d68d3c..0a809f804 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -1128,6 +1128,8 @@ wordReplace = { "D_801D1E20": "gIdentityMtxF", "sSetupDL": "gSetupDLs", + "gFaultStruct": "gFaultMgr", + "D_801BDA9C": "gHorseIsMounted", "D_801BDAA4": "gHorsePlayedEponasSong", diff --git a/tools/sizes/boot_functions.csv b/tools/sizes/boot_functions.csv index c94e9cc72..1c05ba562 100644 --- a/tools/sizes/boot_functions.csv +++ b/tools/sizes/boot_functions.csv @@ -62,27 +62,27 @@ asm/non_matchings/boot/fault/Fault_FillScreenBlack.s,Fault_FillScreenBlack,0x800 asm/non_matchings/boot/fault/Fault_FillScreenRed.s,Fault_FillScreenRed,0x8008212C,0x15 asm/non_matchings/boot/fault/Fault_DrawCornerRec.s,Fault_DrawCornerRec,0x80082180,0x15 asm/non_matchings/boot/fault/Fault_PrintFReg.s,Fault_PrintFReg,0x800821D4,0x2B -asm/non_matchings/boot/fault/osSyncPrintfFReg.s,osSyncPrintfFReg,0x80082280,0x2C +asm/non_matchings/boot/fault/Fault_LogFReg.s,Fault_LogFReg,0x80082280,0x2C asm/non_matchings/boot/fault/Fault_PrintFPCR.s,Fault_PrintFPCR,0x80082330,0x29 -asm/non_matchings/boot/fault/osSyncPrintfFPCR.s,osSyncPrintfFPCR,0x800823D4,0x26 +asm/non_matchings/boot/fault/Fault_LogFPCSR.s,Fault_LogFPCSR,0x800823D4,0x26 asm/non_matchings/boot/fault/Fault_PrintThreadContext.s,Fault_PrintThreadContext,0x8008246C,0xD4 asm/non_matchings/boot/fault/osSyncPrintfThreadContext.s,osSyncPrintfThreadContext,0x800827BC,0xBF asm/non_matchings/boot/fault/Fault_FindFaultedThread.s,Fault_FindFaultedThread,0x80082AB8,0x22 asm/non_matchings/boot/fault/Fault_Wait5Seconds.s,Fault_Wait5Seconds,0x80082B40,0x24 asm/non_matchings/boot/fault/Fault_WaitForButtonCombo.s,Fault_WaitForButtonCombo,0x80082BD0,0x27 -asm/non_matchings/boot/fault/Fault_DrawMemDumpPage.s,Fault_DrawMemDumpPage,0x80082C6C,0x5B +asm/non_matchings/boot/fault/Fault_DrawMemDumpContents.s,Fault_DrawMemDumpContents,0x80082C6C,0x5B asm/non_matchings/boot/fault/Fault_DrawMemDump.s,Fault_DrawMemDump,0x80082DD8,0x7E -asm/non_matchings/boot/fault/Fault_FindNextStackCall.s,Fault_FindNextStackCall,0x80082FD0,0x5D +asm/non_matchings/boot/fault/Fault_WalkStack.s,Fault_WalkStack,0x80082FD0,0x5D asm/non_matchings/boot/fault/Fault_DrawStackTrace.s,Fault_DrawStackTrace,0x80083144,0x64 -asm/non_matchings/boot/fault/osSyncPrintfStackTrace.s,osSyncPrintfStackTrace,0x800832D4,0x5F +asm/non_matchings/boot/fault/Fault_LogStackTrace.s,Fault_LogStackTrace,0x800832D4,0x5F asm/non_matchings/boot/fault/Fault_ResumeThread.s,Fault_ResumeThread,0x80083450,0x1F -asm/non_matchings/boot/fault/Fault_CommitFB.s,Fault_CommitFB,0x800834CC,0x30 +asm/non_matchings/boot/fault/Fault_DisplayFrameBuffer.s,Fault_DisplayFrameBuffer,0x800834CC,0x30 asm/non_matchings/boot/fault/Fault_ProcessClients.s,Fault_ProcessClients,0x8008358C,0x39 asm/non_matchings/boot/fault/Fault_SetOptionsFromController3.s,Fault_SetOptionsFromController3,0x80083670,0x5D -asm/non_matchings/boot/fault/Fault_SetOptions.s,Fault_SetOptions,0x800837E4,0x11 +asm/non_matchings/boot/fault/Fault_UpdatePad.s,Fault_UpdatePad,0x800837E4,0x11 asm/non_matchings/boot/fault/Fault_ThreadEntry.s,Fault_ThreadEntry,0x80083828,0xD2 -asm/non_matchings/boot/fault/Fault_SetFB.s,Fault_SetFB,0x80083B70,0x15 -asm/non_matchings/boot/fault/Fault_Start.s,Fault_Start,0x80083BC4,0x4D +asm/non_matchings/boot/fault/Fault_SetFrameBuffer.s,Fault_SetFrameBuffer,0x80083B70,0x15 +asm/non_matchings/boot/fault/Fault_Init.s,Fault_Init,0x80083BC4,0x4D asm/non_matchings/boot/fault/Fault_HangupFaultClient.s,Fault_HangupFaultClient,0x80083CF8,0x3F asm/non_matchings/boot/fault/Fault_AddHungupAndCrashImpl.s,Fault_AddHungupAndCrashImpl,0x80083DF4,0x16 asm/non_matchings/boot/fault/Fault_AddHungupAndCrash.s,Fault_AddHungupAndCrash,0x80083E4C,0x19 @@ -101,7 +101,7 @@ asm/non_matchings/boot/fault_drawer/FaultDrawer_FormatStringFunc.s,FaultDrawer_F asm/non_matchings/boot/fault_drawer/FaultDrawer_VPrintf.s,FaultDrawer_VPrintf,0x8008477C,0x14 asm/non_matchings/boot/fault_drawer/FaultDrawer_Printf.s,FaultDrawer_Printf,0x800847CC,0x14 asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawText.s,FaultDrawer_DrawText,0x8008481C,0x14 -asm/non_matchings/boot/fault_drawer/FaultDrawer_SetDrawerFB.s,FaultDrawer_SetDrawerFB,0x8008486C,0xE +asm/non_matchings/boot/fault_drawer/FaultDrawer_SetDrawerFrameBuffer.s,FaultDrawer_SetDrawerFrameBuffer,0x8008486C,0xE asm/non_matchings/boot/fault_drawer/FaultDrawer_SetInputCallback.s,FaultDrawer_SetInputCallback,0x800848A4,0x5 asm/non_matchings/boot/fault_drawer/FaultDrawer_Init.s,FaultDrawer_Init,0x800848B8,0x22 asm/non_matchings/boot/boot_80084940/func_80084940.s,func_80084940,0x80084940,0xA |
