dol2asm OK

1 files changed, 210 insertions, 79 deletions

diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp
index 8603431fa8..7b2e397875 100644
--- a/src/m_Do/m_Do_machine_exception.cpp
+++ b/src/m_Do/m_Do_machine_exception.cpp
@@ -1,93 +1,224 @@
-/* m_Do_machine_exception.cpp autogenerated by split.py v0.4 at 2021-01-31 21:28:06.026493 */
-
-#include "JSystem/JKernel/JKRAram/JKRAram.h"
-#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
-#include "global.h"
-
-// additional symbols needed for m_Do_machine_exception.cpp
-// autogenerated by split.py v0.4 at 2021-01-31 21:28:06.026518
-extern "C" {
-void dump__24DynamicModuleControlBaseFv(void);
-void dumpToTerminal__10JUTConsoleFUi(void);
-void print__10JUTConsoleFPCc(void);
-void JUTConsole_print_f_va_(void);
-void _restgpr_23(void);
-void _savegpr_23(void);
-void cr1(void);
-void dump__14dRes_control_cFv(void);
-void dispConsoleToTerminal__Fv(void);
-void dispDateInfo__Fv(void);
-void dispGameInfo__Fv(void);
-void dispHeapInfo__Fv(void);
-void dump__11JKRAramHeapFv(void);
-void exception_addition__FP10JUTConsole(void);
-void getFreeSize__7JKRHeapCFv(void);
-void getTotalFreeSize__7JKRHeapCFv(void);
-void print__FPCc(void);
-void print_f__FPCce(void);
-}
+// 
+// Generated By: dol2asm
+// Translation Unit: m_Do/m_Do_machine_exception
+// 
+
+#include "dol2asm.h"
+#include "dolphin/types.h"
+#include "m_Do/m_Do_machine_exception.h"
+
+// 
+// Types:
+// 
+
+struct dRes_control_c {
+	/* 8003C638 */ void dump();
+};
+
+struct JUTConsole {
+	/* 802E7C38 */ void print(char const*);
+	/* 802E7F7C */ void dumpToTerminal(unsigned int);
+};
+
+struct JKRHeap {
+	/* 802CE72C */ void getFreeSize();
+	/* 802CE784 */ void getTotalFreeSize();
+};
+
+struct JKRAramHeap {
+	/* 802D3218 */ void dump();
+};
+
+struct DynamicModuleControlBase {
+	/* 80262470 */ void dump();
+};
+
+// 
+// Forward References:
+// 
+
+static void print_f(char const*, ...);
+static void print(char const*);
+static void dispHeapInfo();
+static void dispGameInfo();
+static void dispDateInfo();
+static void dispConsoleToTerminal();
+void exception_addition(JUTConsole*);
+extern "C" extern char const* const m_Do_m_Do_machine_exception__stringBase0;
+extern "C" extern u8 struct_80450C98[4];
+extern "C" extern u8 struct_80450C9C[4];
+
+extern "C" static void print_f__FPCce();
+extern "C" static void print__FPCc();
+extern "C" static void dispHeapInfo__Fv();
+extern "C" static void dispGameInfo__Fv();
+extern "C" static void dispDateInfo__Fv();
+extern "C" static void dispConsoleToTerminal__Fv();
+extern "C" void exception_addition__FP10JUTConsole();
+extern "C" extern char const* const m_Do_m_Do_machine_exception__stringBase0;
+extern "C" extern u8 struct_80450C98[4];
+extern "C" extern u8 struct_80450C9C[4];
+
+// 
+// External References:
+// 
 
-// additional symbols needed for m_Do_machine_exception.cpp
-// autogenerated by split.py v0.4 at 2021-01-31 21:28:06.026523
-extern u8 lbl_80374460;
-extern u32 lbl_80450B08;
-extern u32 lbl_80450B0C;
-extern u8 lbl_80450B10;
-extern u8 lbl_80450B14;
-extern u8 lbl_80450C28;
-extern u8 lbl_80450C2C;
-extern u8 lbl_80450C34;
-extern u8 lbl_80450C90;
-extern JUTConsole* lbl_804511B8;
-extern u8 lbl_803A2EE0;
-
-extern "C" {
-// print_f__FPCce
-// print_f__FPCce(const s8*, varargs...)
-asm void print_f__FPCce(void) {
-    nofralloc
-#include "m_Do/m_Do_machine_exception/asm/func_80017D7C.s"
+extern "C" extern u8 COPYDATE_STRING__7mDoMain[18 + 2 /* padding */];
+extern "C" extern u8 g_dComIfG_gameInfo[122384];
+extern "C" extern u8 sPowerOnTime__7mDoMain[4];
+extern "C" extern u8 data_80450B0C[4];
+extern "C" extern u8 sHungUpTime__7mDoMain[4];
+extern "C" extern u8 data_80450B14[4];
+extern "C" extern u8 gameHeap[4];
+extern "C" extern u8 zeldaHeap[4];
+extern "C" extern u8 archiveHeap[4];
+extern "C" extern u8 systemConsole__9JFWSystem[4];
+extern "C" extern u8 sAramObject__7JKRAram[4];
+
+extern "C" void dump__14dRes_control_cFv();
+extern "C" void dump__24DynamicModuleControlBaseFv();
+extern "C" void getFreeSize__7JKRHeapFv();
+extern "C" void getTotalFreeSize__7JKRHeapFv();
+extern "C" void dump__11JKRAramHeapFv();
+extern "C" void print__10JUTConsoleFPCc();
+extern "C" void JUTConsole_print_f_va_();
+extern "C" void dumpToTerminal__10JUTConsoleFUi();
+extern "C" void OSTicksToCalendarTime();
+extern "C" void _savegpr_23();
+extern "C" void _restgpr_23();
+extern "C" extern u8 COPYDATE_STRING__7mDoMain[18 + 2 /* padding */];
+extern "C" extern u8 g_dComIfG_gameInfo[122384];
+extern "C" extern u8 sPowerOnTime__7mDoMain[4];
+extern "C" extern u8 data_80450B0C[4];
+extern "C" extern u8 sHungUpTime__7mDoMain[4];
+extern "C" extern u8 data_80450B14[4];
+extern "C" extern u8 gameHeap[4];
+extern "C" extern u8 zeldaHeap[4];
+extern "C" extern u8 archiveHeap[4];
+extern "C" extern u8 systemConsole__9JFWSystem[4];
+extern "C" extern u8 sAramObject__7JKRAram[4];
+
+// 
+// Declarations:
+// 
+
+/* ############################################################################################## */
+/* 80450C90-80450C98 0004+04 s=3 e=0 z=0  None .sbss      sConsole                                                     */
+static u8 sConsole[4 + 4 /* padding */];
+
+/* 80017D7C-80017E08 008C+00 s=3 e=0 z=0  None .text      print_f__FPCce                                               */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm static void print_f(char const* param_0, ...) {
+	nofralloc
+#include "asm/m_Do/m_Do_machine_exception/print_f__FPCce.s"
 }
+#pragma pop
 
-// print__FPCc
-// print(const s8*)
-asm void print__FPCc(void) {
-    nofralloc
-#include "m_Do/m_Do_machine_exception/asm/func_80017E08.s"
+
+/* 80017E08-80017E30 0028+00 s=2 e=0 z=0  None .text      print__FPCc                                                  */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm static void print(char const* param_0) {
+	nofralloc
+#include "asm/m_Do/m_Do_machine_exception/print__FPCc.s"
 }
+#pragma pop
+
 
-// dispHeapInfo__Fv
-// dispHeapInfo__Fv(void)
-asm void dispHeapInfo__Fv(void) {
-    nofralloc
-#include "m_Do/m_Do_machine_exception/asm/func_80017E30.s"
+/* ############################################################################################## */
+/* 80374460-80374640 01DF+01 s=3 e=0 z=0  None .rodata    @stringBase0                                                 */
+#pragma push
+#pragma force_active on
+#pragma section ".dead"
+SECTION_DEAD char const* const stringBase_80374460 = 
+    "--------------------------------------\n";
+SECTION_DEAD char const* const stringBase_80374488 = 
+    "-- Heap Free / TotalFree (KB) --\n";
+SECTION_DEAD char const* const stringBase_803744AA = "  Zelda %5d / %5d\n";
+SECTION_DEAD char const* const stringBase_803744BD = "   Game %5d / %5d\n";
+SECTION_DEAD char const* const stringBase_803744D0 = "Archive %5d / %5d\n";
+SECTION_DEAD char const* const stringBase_803744E3 = 
+    "--------------------------------\n";
+SECTION_DEAD char const* const stringBase_80374505 = "Start StageName:RoomNo [%s:%d]\n";
+SECTION_DEAD char const* const stringBase_80374525 = 
+    "------------- Date Infomation ---------\n";
+SECTION_DEAD char const* const stringBase_8037454E = " FINAL VERSION\n";
+SECTION_DEAD char const* const stringBase_8037455E = "COMPILE USER: FINAL\n";
+SECTION_DEAD char const* const stringBase_80374573 = "COPYDATE   : %17s\n";
+SECTION_DEAD char const* const stringBase_80374586 = 
+    "PowerOnTime: %04d/%2d/%2d %2d:%2d:%2d`%03d\"%03d\n";
+SECTION_DEAD char const* const stringBase_803745B7 = 
+    "HungUpTime : %04d/%2d/%2d %2d:%2d:%2d`%03d\"%03d\n";
+SECTION_DEAD char const* const stringBase_803745E8 = 
+    "PlayTime   : %4d days, %2d:%2d:%2d`%03d\"%03d\n";
+SECTION_DEAD char const* const stringBase_80374616 = 
+    "---------------------------------------\n";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_8037463F = "";
+#pragma pop
+
+/* 80017E30-80017F8C 015C+00 s=1 e=0 z=0  None .text      dispHeapInfo__Fv                                             */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm static void dispHeapInfo() {
+	nofralloc
+#include "asm/m_Do/m_Do_machine_exception/dispHeapInfo__Fv.s"
 }
+#pragma pop
+
 
-// dispGameInfo__Fv
-// dispGameInfo__Fv(void)
-asm void dispGameInfo__Fv(void) {
-    nofralloc
-#include "m_Do/m_Do_machine_exception/asm/func_80017F8C.s"
+/* 80017F8C-80017FD0 0044+00 s=1 e=0 z=0  None .text      dispGameInfo__Fv                                             */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm static void dispGameInfo() {
+	nofralloc
+#include "asm/m_Do/m_Do_machine_exception/dispGameInfo__Fv.s"
 }
+#pragma pop
 
-// dispDateInfo__Fv
-// dispDateInfo__Fv(void)
-asm void dispDateInfo__Fv(void) {
-    nofralloc
-#include "m_Do/m_Do_machine_exception/asm/func_80017FD0.s"
+
+/* 80017FD0-80018124 0154+00 s=1 e=0 z=0  None .text      dispDateInfo__Fv                                             */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm static void dispDateInfo() {
+	nofralloc
+#include "asm/m_Do/m_Do_machine_exception/dispDateInfo__Fv.s"
 }
+#pragma pop
+
 
-// dispConsoleToTerminal__Fv
-// dispConsoleToTerminal__Fv(void)
-asm void dispConsoleToTerminal__Fv(void) {
-    nofralloc
-#include "m_Do/m_Do_machine_exception/asm/func_80018124.s"
+/* 80018124-8001814C 0028+00 s=1 e=0 z=0  None .text      dispConsoleToTerminal__Fv                                    */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm static void dispConsoleToTerminal() {
+	nofralloc
+#include "asm/m_Do/m_Do_machine_exception/dispConsoleToTerminal__Fv.s"
 }
+#pragma pop
 
-// exception_addition__FP10JUTConsole
-// exception_addition__FP10JUTConsole(JUTConsole*)
-asm void exception_addition__FP10JUTConsole(void) {
-    nofralloc
-#include "m_Do/m_Do_machine_exception/asm/func_8001814C.s"
+
+/* 8001814C-8001817C 0030+00 s=0 e=1 z=0  None .text      exception_addition__FP10JUTConsole                           */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void exception_addition(JUTConsole* param_0) {
+	nofralloc
+#include "asm/m_Do/m_Do_machine_exception/exception_addition__FP10JUTConsole.s"
 }
-};
+#pragma pop
+
+
+/* ############################################################################################## */
+/* 80450C98-80450C9C 0004+00 s=0 e=0 z=50  None .sbss      None                                                         */
+u8 struct_80450C98[4];
+
+/* 80450C9C-80450CA0 0004+00 s=0 e=0 z=6  None .sbss      None                                                         */
+u8 struct_80450C9C[4];
+