Fault + Fault_drawer (#77)

* Fault OK

* fault_drawer OK

* Cleanup

* Cleanup pt 2

* Forgot to save

* PR

1 files changed, 53 insertions, 60 deletions

diff --git a/linker_scripts/jp/symbol_addrs_boot.txt b/linker_scripts/jp/symbol_addrs_boot.txt
index 38ae7bc..654bfe8 100644
--- a/linker_scripts/jp/symbol_addrs_boot.txt
+++ b/linker_scripts/jp/symbol_addrs_boot.txt
@@ -46,48 +46,48 @@ osSyncPrintfUnused = 0x800272C0; // type:func
 osSyncPrintf = 0x800272DC; // type:func
 rmonPrintf = 0x800272F8; // type:func
 
-Fault_SleepImpl = 0x80027320; // type:func
-Fault_ClientProcessThread = 0x80027390; // type:func
-Fault_ClientRunTask = 0x80027404; // type:func
-Fault_ProcessClient = 0x80027588; // type:func
-Fault_AddClient = 0x800275DC; // type:func
-Fault_RemoveClient = 0x800276C0; // type:func
-Fault_AddAddrConvClient = 0x800277B8; // type:func
-Fault_RemoveAddrConvClient = 0x80027890; // type:func
-Fault_ConvertAddress = 0x80027988; // type:func
-Fault_Sleep = 0x80027A3C; // type:func
-Fault_PadCallback = 0x80027A78; // type:func
-Fault_UpdatePadImpl = 0x80027AB4; // type:func
-Fault_WaitForInputImpl = 0x80027B00; // type:func
-Fault_WaitForInput = 0x80027C4C; // type:func
-Fault_DrawRec = 0x80027C98; // type:func
-Fault_FillScreenBlack = 0x80027CF8; // type:func
-Fault_FillScreenRed = 0x80027D4C; // type:func
-Fault_DrawCornerRec = 0x80027DA0; // type:func
-Fault_PrintFReg = 0x80027DF4; // type:func
-Fault_LogFReg = 0x80027EA0; // type:func
-Fault_PrintFPCSR = 0x80027F50; // type:func
-Fault_LogFPCSR = 0x80027FF4; // type:func
-Fault_PrintThreadContext = 0x8002808C; // type:func
-Fault_LogThreadContext = 0x800283A8; // type:func
-Fault_FindFaultedThread = 0x800286A4; // type:func
-Fault_Wait5Seconds = 0x8002872C; // type:func
-Fault_WaitForButtonCombo = 0x800287BC; // type:func
-Fault_DrawMemDumpContents = 0x80028A88; // type:func
-Fault_DrawMemDump = 0x80028BF4; // type:func
-Fault_WalkStack = 0x80028DF8; // type:func
-Fault_DrawStackTrace = 0x80028F88; // type:func
-Fault_LogStackTrace = 0x80029108; // type:func
-Fault_ResumeThread = 0x80029278; // type:func
-Fault_DisplayFrameBuffer = 0x800292F4; // type:func
-Fault_ProcessClients = 0x800293B4; // type:func
-Fault_UpdatePad = 0x80029494; // type:func
-Fault_ThreadEntry = 0x800294D0; // type:func
-Fault_SetFrameBuffer = 0x80029830; // type:func
-Fault_Init = 0x80029884; // type:func
-Fault_HungupFaultClient = 0x800299B8; // type:func
-Fault_AddHungupAndCrashImpl = 0x80029AB4; // type:func
-Fault_AddHungupAndCrash = 0x80029B0C; // type:func
+fault_SleepImpl = 0x80027320; // type:func
+fault_ClientProcessThread = 0x80027390; // type:func
+fault_ClientRunTask = 0x80027404; // type:func
+fault_ProcessClient = 0x80027588; // type:func
+fault_AddClient = 0x800275DC; // type:func
+fault_RemoveClient = 0x800276C0; // type:func
+fault_AddressConverterAddClient = 0x800277B8; // type:func
+fault_AddressConverterRemoveClient = 0x80027890; // type:func
+fault_ConvertAddress = 0x80027988; // type:func
+fault_Sleep = 0x80027A3C; // type:func
+fault_PadCallback = 0x80027A78; // type:func
+fault_UpdatePadImpl = 0x80027AB4; // type:func
+fault_WaitForInputImpl = 0x80027B00; // type:func
+fault_WaitForInput = 0x80027C4C; // type:func
+fault_DrawRec = 0x80027C98; // type:func
+fault_FillScreenBlack = 0x80027CF8; // type:func
+fault_FillScreenRed = 0x80027D4C; // type:func
+fault_DrawCornerRec = 0x80027DA0; // type:func
+fault_PrintFReg = 0x80027DF4; // type:func
+fault_LogFReg = 0x80027EA0; // type:func
+fault_PrintFPCSR = 0x80027F50; // type:func
+fault_LogFPCSR = 0x80027FF4; // type:func
+fault_PrintThreadContext = 0x8002808C; // type:func
+fault_LogThreadContext = 0x800283A8; // type:func
+FindFaultedThread = 0x800286A4; // type:func
+fault_Wait5Seconds = 0x8002872C; // type:func
+fault_WaitForButtonCombo = 0x800287BC; // type:func
+fault_DrawMemDumpContents = 0x80028A88; // type:func
+fault_DrawMemDump = 0x80028BF4; // type:func
+fault_WalkStack = 0x80028DF8; // type:func
+fault_DrawStackTrace = 0x80028F88; // type:func
+fault_LogStackTrace = 0x80029108; // type:func
+fault_ResumeThread = 0x80029278; // type:func
+fault_DisplayFrameBuffer = 0x800292F4; // type:func
+fault_ProcessClients = 0x800293B4; // type:func
+fault_UpdatePad = 0x80029494; // type:func
+fault_ThreadEntry = 0x800294D0; // type:func
+fault_SetFrameBuffer = 0x80029830; // type:func
+fault_Init = 0x80029884; // type:func
+fault_HungupFaultClient = 0x800299B8; // type:func
+fault_AddHungupAndCrashImpl = 0x80029AB4; // type:func
+fault_AddHungupAndCrash = 0x80029B0C; // type:func
 
 FaultDrawer_SetOsSyncPrintfEnabled = 0x80029B70; // type:func
 FaultDrawer_DrawRecImpl = 0x80029B80; // type:func
@@ -272,8 +272,8 @@ gViConfigXScale = 0x8003BBC8; // type:f32
 gViConfigYScale = 0x8003BBCC; // type:f32
 carthandle = 0x8003BBD0; //
 gDmaMgrDmaBuffSize = 0x8003BBE0; //
-D_8003BBF0_jp = 0x8003BBF0; //
-D_8003BC38_jp = 0x8003BC38; //
+sExceptionNames = 0x8003BBF0; //
+sFpExceptionNames = 0x8003BC38; //
 D_8003BC50_jp = 0x8003BC50; //
 
 D_8003BC90_jp = 0x8003BC90; // size:0x4
@@ -458,7 +458,7 @@ RO_STR_8003DE00_jp = 0x8003DE00; // type:asciz
 RO_STR_8003DE04_jp = 0x8003DE04; // type:asciz
 RO_STR_8003DE0C_jp = 0x8003DE0C; // type:asciz
 jtbl_8003DE1C_jp = 0x8003DE1C; // type:jtbl
-RO_8003DE50_jp = 0x8003DE50; //
+sFaultDrawerFont = 0x8003DE50; //
 RO_STR_8003E250_jp = 0x8003E250; // type:asciz
 RO_STR_8003E254_jp = 0x8003E254; // type:asciz
 RO_STR_8003E25C_jp = 0x8003E25C; // type:asciz
@@ -545,21 +545,14 @@ B_80040AC4_jp = 0x80040AC4; //
 B_80040AC8_jp = 0x80040AC8; //
 B_80040ACC_jp = 0x80040ACC; //
 B_80040AD0_jp = 0x80040AD0; //
-B_80040AE0_jp = 0x80040AE0; //
-B_80040AE4_jp = 0x80040AE4; // type:u8
-B_80040AE8_jp = 0x80040AE8; //
-B_800410E8_jp = 0x800410E8; //
-B_80041108_jp = 0x80041108; // type:u8
-B_800418D6_jp = 0x800418D6; // type:s8
-B_800418D8_jp = 0x800418D8; //
-B_80041960_jp = 0x80041960; // type:s8
-B_80041964_jp = 0x80041964; // type:u16
-B_80041970_jp = 0x80041970; // type:u16
-B_80041972_jp = 0x80041972; // type:u16
-B_80041980_jp = 0x80041980; // type:u16
-B_80041982_jp = 0x80041982; // type:u16
-B_80041995_jp = 0x80041995; // type:s8
-B_80041998_jp = 0x80041998; //
+
+sFaultInstance = 0x80040AE0; //
+sFaultAwaitingInput = 0x80040AE4; // type:u8
+sFaultStack = 0x80040AE8; //
+sFaultThreadInfo = 0x800410E8; //
+gFaultMgr = 0x80041108; // size:0x850
+
+sFaultDrawer = 0x80041960; // size:0x3C
 
 __gfxprint_default_flags = 0x800419A0; // type:u8 size:0x1