mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-01 16:29:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

debugDisplay and Debug_console attemp

Browse Source
This commit is contained in:
Pheenoh
2021-02-07 17:20:16 -05:00
parent 315ef319fc
commit 34693ded85
70 changed files with 547 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_graphic/asm/func_800091C0.s
+4 -4
View File
@@ -169,16 +169,16 @@ lbl_8000921C:
/* 8000945C 0000639C B0 64 80 00 */ sth r3, -0x8000(r4)
lbl_80009460:
/* 80009460 000063A0 C0 3F 00 24 */ lfs f1, 0x24(r31)
/* 80009464 000063A4 48 35 8C 49 */ bl func_803620AC
/* 80009464 000063A4 48 35 8C 49 */ bl __cvt_fp2unsigned
/* 80009468 000063A8 7C 7C 1B 78 */ mr r28, r3
/* 8000946C 000063AC C0 3F 00 20 */ lfs f1, 0x20(r31)
/* 80009470 000063B0 48 35 8C 3D */ bl func_803620AC
/* 80009470 000063B0 48 35 8C 3D */ bl __cvt_fp2unsigned
/* 80009474 000063B4 7C 7D 1B 78 */ mr r29, r3
/* 80009478 000063B8 C0 3F 00 1C */ lfs f1, 0x1c(r31)
/* 8000947C 000063BC 48 35 8C 31 */ bl func_803620AC
/* 8000947C 000063BC 48 35 8C 31 */ bl __cvt_fp2unsigned
/* 80009480 000063C0 7C 7E 1B 78 */ mr r30, r3
/* 80009484 000063C4 C0 3F 00 18 */ lfs f1, 0x18(r31)
/* 80009488 000063C8 48 35 8C 25 */ bl func_803620AC
/* 80009488 000063C8 48 35 8C 25 */ bl __cvt_fp2unsigned
/* 8000948C 000063CC 7F C4 F3 78 */ mr r4, r30
/* 80009490 000063D0 7F A5 EB 78 */ mr r5, r29
/* 80009494 000063D4 7F 86 E3 78 */ mr r6, r28
include/m_Do/m_Do_graphic/asm/func_8000A604.s
+4 -4
View File
@@ -142,16 +142,16 @@ lbl_8000A818:
/* 8000A82C 0000776C C0 DD 00 14 */ lfs f6, 0x14(r29)
/* 8000A830 00007770 48 35 5C 35 */ bl GXSetViewport
/* 8000A834 00007774 C0 3D 00 0C */ lfs f1, 0xc(r29)
/* 8000A838 00007778 48 35 78 75 */ bl func_803620AC
/* 8000A838 00007778 48 35 78 75 */ bl __cvt_fp2unsigned
/* 8000A83C 0000777C 7C 76 1B 78 */ mr r22, r3
/* 8000A840 00007780 C0 3D 00 08 */ lfs f1, 8(r29)
/* 8000A844 00007784 48 35 78 69 */ bl func_803620AC
/* 8000A844 00007784 48 35 78 69 */ bl __cvt_fp2unsigned
/* 8000A848 00007788 7C 77 1B 78 */ mr r23, r3
/* 8000A84C 0000778C C0 3D 00 04 */ lfs f1, 4(r29)
/* 8000A850 00007790 48 35 78 5D */ bl func_803620AC
/* 8000A850 00007790 48 35 78 5D */ bl __cvt_fp2unsigned
/* 8000A854 00007794 7C 78 1B 78 */ mr r24, r3
/* 8000A858 00007798 C0 3D 00 00 */ lfs f1, 0(r29)
/* 8000A85C 0000779C 48 35 78 51 */ bl func_803620AC
/* 8000A85C 0000779C 48 35 78 51 */ bl __cvt_fp2unsigned
/* 8000A860 000077A0 7F 04 C3 78 */ mr r4, r24
/* 8000A864 000077A4 7E E5 BB 78 */ mr r5, r23
/* 8000A868 000077A8 7E C6 B3 78 */ mr r6, r22
include/m_Do/m_Do_graphic/m_Do_graphic.h
+1 -1
View File
@@ -107,7 +107,7 @@ void func_8000A604(void);
void func_8000B118(void);
void func_8000B1D0(void);
void func_8000B1E4(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void mDoExt_adjustSolidHeap(void);
void mDoExt_createSolidHeapToCurrent_X1_(void);
void mDoExt_restoreCurrentHeap(void);
include/m_Do/m_Do_machine/asm/func_8000B95C.s
+8 -8
View File
@@ -119,7 +119,7 @@ lbl_8000BB0C:
/* 8000BB14 00008A54 40 82 00 14 */ bne lbl_8000BB28
/* 8000BB18 00008A58 7F C3 F3 78 */ mr r3, r30
/* 8000BB1C 00008A5C 80 9E 00 24 */ lwz r4, 0x24(r30)
/* 8000BB20 00008A60 48 2D C5 89 */ bl JUTConsole_NS_scroll
/* 8000BB20 00008A60 48 2D C5 89 */ bl scroll__10JUTConsoleFi
/* 8000BB24 00008A64 38 60 00 01 */ li r3, 1
lbl_8000BB28:
/* 8000BB28 00008A68 80 01 00 08 */ lwz r0, 8(r1)
@@ -128,7 +128,7 @@ lbl_8000BB28:
/* 8000BB34 00008A74 7F C3 F3 78 */ mr r3, r30
/* 8000BB38 00008A78 80 1E 00 24 */ lwz r0, 0x24(r30)
/* 8000BB3C 00008A7C 7C 80 00 D0 */ neg r4, r0
/* 8000BB40 00008A80 48 2D C5 69 */ bl JUTConsole_NS_scroll
/* 8000BB40 00008A80 48 2D C5 69 */ bl scroll__10JUTConsoleFi
/* 8000BB44 00008A84 38 60 00 01 */ li r3, 1
lbl_8000BB48:
/* 8000BB48 00008A88 80 01 00 0C */ lwz r0, 0xc(r1)
@@ -150,7 +150,7 @@ lbl_8000BB78:
/* 8000BB80 00008AC0 40 80 00 08 */ bge lbl_8000BB88
/* 8000BB84 00008AC4 38 80 FF FC */ li r4, -4
lbl_8000BB88:
/* 8000BB88 00008AC8 48 2D C5 21 */ bl JUTConsole_NS_scroll
/* 8000BB88 00008AC8 48 2D C5 21 */ bl scroll__10JUTConsoleFi
/* 8000BB8C 00008ACC 38 60 00 01 */ li r3, 1
/* 8000BB90 00008AD0 3B A0 00 00 */ li r29, 0
/* 8000BB94 00008AD4 3B FF 00 01 */ addi r31, r31, 1
@@ -174,7 +174,7 @@ lbl_8000BBC8:
/* 8000BBD0 00008B10 40 80 00 08 */ bge lbl_8000BBD8
/* 8000BBD4 00008B14 38 80 00 04 */ li r4, 4
lbl_8000BBD8:
/* 8000BBD8 00008B18 48 2D C4 D1 */ bl JUTConsole_NS_scroll
/* 8000BBD8 00008B18 48 2D C4 D1 */ bl scroll__10JUTConsoleFi
/* 8000BBDC 00008B1C 38 60 00 01 */ li r3, 1
/* 8000BBE0 00008B20 3B E0 00 00 */ li r31, 0
/* 8000BBE4 00008B24 3B BD 00 01 */ addi r29, r29, 1
@@ -209,7 +209,7 @@ lbl_8000BC40:
/* 8000BC40 00008B80 7F E3 FB 78 */ mr r3, r31
/* 8000BC44 00008B84 80 1F 00 24 */ lwz r0, 0x24(r31)
/* 8000BC48 00008B88 7C 80 00 D0 */ neg r4, r0
/* 8000BC4C 00008B8C 48 2D C4 5D */ bl JUTConsole_NS_scroll
/* 8000BC4C 00008B8C 48 2D C4 5D */ bl scroll__10JUTConsoleFi
/* 8000BC50 00008B90 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13)
/* 8000BC54 00008B94 38 80 00 01 */ li r4, 1
/* 8000BC58 00008B98 48 2D C7 F9 */ bl JUTConsoleManager_NS_drawDirect
@@ -221,13 +221,13 @@ lbl_8000BC64:
lbl_8000BC6C:
/* 8000BC6C 00008BAC 7F E3 FB 78 */ mr r3, r31
/* 8000BC70 00008BB0 38 80 00 01 */ li r4, 1
/* 8000BC74 00008BB4 48 2D C4 35 */ bl JUTConsole_NS_scroll
/* 8000BC74 00008BB4 48 2D C4 35 */ bl scroll__10JUTConsoleFi
/* 8000BC78 00008BB8 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13)
/* 8000BC7C 00008BBC 38 80 00 01 */ li r4, 1
/* 8000BC80 00008BC0 48 2D C7 D1 */ bl JUTConsoleManager_NS_drawDirect
/* 8000BC84 00008BC4 83 9F 00 48 */ lwz r28, 0x48(r31)
/* 8000BC88 00008BC8 7F E3 FB 78 */ mr r3, r31
/* 8000BC8C 00008BCC 48 2D C5 1D */ bl JUTConsole_NS_getLineOffset
/* 8000BC8C 00008BCC 48 2D C5 1D */ bl getLineOffset__10JUTConsoleCFv
/* 8000BC90 00008BD0 7C 7D 1B 78 */ mr r29, r3
/* 8000BC94 00008BD4 7F E3 FB 78 */ mr r3, r31
/* 8000BC98 00008BD8 48 2D C4 ED */ bl JUTConsole_NS_getUsedLine
@@ -246,7 +246,7 @@ lbl_8000BCC0:
/* 8000BCC4 00008C04 48 2D 7C BD */ bl JUTException_NS_waitTime
/* 8000BCC8 00008C08 83 9F 00 48 */ lwz r28, 0x48(r31)
/* 8000BCCC 00008C0C 7F E3 FB 78 */ mr r3, r31
/* 8000BCD0 00008C10 48 2D C4 D9 */ bl JUTConsole_NS_getLineOffset
/* 8000BCD0 00008C10 48 2D C4 D9 */ bl getLineOffset__10JUTConsoleCFv
/* 8000BCD4 00008C14 7C 7D 1B 78 */ mr r29, r3
/* 8000BCD8 00008C18 7F E3 FB 78 */ mr r3, r31
/* 8000BCDC 00008C1C 48 2D C4 A9 */ bl JUTConsole_NS_getUsedLine
include/m_Do/m_Do_machine_exception/asm/func_80018124.s
+1 -1
View File
@@ -3,7 +3,7 @@
/* 8001812C 0001506C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80018130 00015070 80 6D 8C 38 */ lwz r3, lbl_804511B8-_SDA_BASE_(r13)
/* 80018134 00015074 38 80 FF FF */ li r4, -1
/* 80018138 00015078 48 2C FE 45 */ bl JUTConsole_NS_dumpToTerminal
/* 80018138 00015078 48 2C FE 45 */ bl dumpToTerminal__10JUTConsoleFUi
/* 8001813C 0001507C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80018140 00015080 7C 08 03 A6 */ mtlr r0
/* 80018144 00015084 38 21 00 10 */ addi r1, r1, 0x10
include/m_Do/m_Do_main/asm/func_80005D4C.s
+11 -11
View File
@@ -50,7 +50,7 @@ lbl_80005DD0:
/* 80005E04 00002D44 54 00 D9 7E */ srwi r0, r0, 5
/* 80005E08 00002D48 98 1F 00 68 */ stb r0, 0x68(r31)
/* 80005E0C 00002D4C 38 60 00 00 */ li r3, 0
/* 80005E10 00002D50 48 2D EE 2D */ bl JUTAssertion_NS_setMessageCount
/* 80005E10 00002D50 48 2D EE 2D */ bl setMessageCount__12JUTAssertionFi
lbl_80005E14:
/* 80005E14 00002D54 88 1F 00 68 */ lbz r0, 0x68(r31)
/* 80005E18 00002D58 28 00 00 00 */ cmplwi r0, 0
@@ -78,7 +78,7 @@ lbl_80005E54:
/* 80005E68 00002DA8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 80005E6C 00002DAC 41 82 00 0C */ beq lbl_80005E78
/* 80005E70 00002DB0 7F E3 FB 78 */ mr r3, r31
/* 80005E74 00002DB4 48 2E 17 79 */ bl JUTConsole_NS_clear
/* 80005E74 00002DB4 48 2E 17 79 */ bl clear__10JUTConsoleFv
lbl_80005E78:
/* 80005E78 00002DB8 80 7C 00 00 */ lwz r3, 0(r28)
/* 80005E7C 00002DBC 54 60 05 2B */ rlwinm. r0, r3, 0, 0x14, 0x15
@@ -119,7 +119,7 @@ lbl_80005ED4:
/* 80005EFC 00002E3C EC 02 00 28 */ fsubs f0, f2, f0
/* 80005F00 00002E40 D0 0D 85 AC */ stfs f0, lbl_80450B2C-_SDA_BASE_(r13)
/* 80005F04 00002E44 7F E3 FB 78 */ mr r3, r31
/* 80005F08 00002E48 48 2E 21 A1 */ bl JUTConsole_NS_scroll
/* 80005F08 00002E48 48 2E 21 A1 */ bl scroll__10JUTConsoleFi
/* 80005F0C 00002E4C 48 00 00 2C */ b lbl_80005F38
lbl_80005F10:
/* 80005F10 00002E50 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15
@@ -139,7 +139,7 @@ lbl_80005F38:
/* 80005F40 00002E80 41 82 00 18 */ beq lbl_80005F58
/* 80005F44 00002E84 7F E3 FB 78 */ mr r3, r31
/* 80005F48 00002E88 38 80 FF FF */ li r4, -1
/* 80005F4C 00002E8C 48 2E 20 31 */ bl JUTConsole_NS_dumpToTerminal
/* 80005F4C 00002E8C 48 2E 20 31 */ bl dumpToTerminal__10JUTConsoleFUi
/* 80005F50 00002E90 38 00 00 03 */ li r0, 3
/* 80005F54 00002E94 90 1F 00 58 */ stw r0, 0x58(r31)
lbl_80005F58:
@@ -150,7 +150,7 @@ lbl_80005F58:
/* 80005F68 00002EA8 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 80005F6C 00002EAC 38 C6 01 B1 */ addi r6, r6, 0x1b1
/* 80005F70 00002EB0 4C C6 31 82 */ crclr 6
/* 80005F74 00002EB4 48 2D A6 8D */ bl JUTReport_X1_
/* 80005F74 00002EB4 48 2D A6 8D */ bl JUTReport__FiiiPCce
/* 80005F78 00002EB8 38 60 00 1E */ li r3, 0x1e
/* 80005F7C 00002EBC 38 80 01 90 */ li r4, 0x190
/* 80005F80 00002EC0 38 A0 00 01 */ li r5, 1
@@ -158,7 +158,7 @@ lbl_80005F58:
/* 80005F88 00002EC8 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 80005F8C 00002ECC 38 C6 01 D3 */ addi r6, r6, 0x1d3
/* 80005F90 00002ED0 4C C6 31 82 */ crclr 6
/* 80005F94 00002ED4 48 2D A6 6D */ bl JUTReport_X1_
/* 80005F94 00002ED4 48 2D A6 6D */ bl JUTReport__FiiiPCce
/* 80005F98 00002ED8 38 60 00 1E */ li r3, 0x1e
/* 80005F9C 00002EDC 38 80 01 9A */ li r4, 0x19a
/* 80005FA0 00002EE0 38 A0 00 01 */ li r5, 1
@@ -166,9 +166,9 @@ lbl_80005F58:
/* 80005FA8 00002EE8 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 80005FAC 00002EEC 38 C6 01 ED */ addi r6, r6, 0x1ed
/* 80005FB0 00002EF0 4C C6 31 82 */ crclr 6
/* 80005FB4 00002EF4 48 2D A6 4D */ bl JUTReport_X1_
/* 80005FB4 00002EF4 48 2D A6 4D */ bl JUTReport__FiiiPCce
/* 80005FB8 00002EF8 7F E3 FB 78 */ mr r3, r31
/* 80005FBC 00002EFC 48 2E 21 ED */ bl JUTConsole_NS_getLineOffset
/* 80005FBC 00002EFC 48 2E 21 ED */ bl getLineOffset__10JUTConsoleCFv
/* 80005FC0 00002F00 7C 67 1B 78 */ mr r7, r3
/* 80005FC4 00002F04 38 60 00 1E */ li r3, 0x1e
/* 80005FC8 00002F08 38 80 01 A4 */ li r4, 0x1a4
@@ -180,7 +180,7 @@ lbl_80005F58:
/* 80005FE0 00002F20 81 3F 00 44 */ lwz r9, 0x44(r31)
/* 80005FE4 00002F24 81 5F 00 58 */ lwz r10, 0x58(r31)
/* 80005FE8 00002F28 4C C6 31 82 */ crclr 6
/* 80005FEC 00002F2C 48 2D A6 15 */ bl JUTReport_X1_
/* 80005FEC 00002F2C 48 2D A6 15 */ bl JUTReport__FiiiPCce
/* 80005FF0 00002F30 48 00 01 00 */ b lbl_800060F0
lbl_80005FF4:
/* 80005FF4 00002F34 80 9E 00 00 */ lwz r4, 0(r30)
@@ -242,7 +242,7 @@ lbl_800060B0:
/* 800060C0 00003000 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 800060C4 00003004 38 C6 02 35 */ addi r6, r6, 0x235
/* 800060C8 00003008 4C C6 31 82 */ crclr 6
/* 800060CC 0000300C 48 2D A5 35 */ bl JUTReport_X1_
/* 800060CC 0000300C 48 2D A5 35 */ bl JUTReport__FiiiPCce
/* 800060D0 00003010 38 60 00 1E */ li r3, 0x1e
/* 800060D4 00003014 38 80 01 C2 */ li r4, 0x1c2
/* 800060D8 00003018 38 A0 00 01 */ li r5, 1
@@ -250,7 +250,7 @@ lbl_800060B0:
/* 800060E0 00003020 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 800060E4 00003024 38 C6 02 5B */ addi r6, r6, 0x25b
/* 800060E8 00003028 4C C6 31 82 */ crclr 6
/* 800060EC 0000302C 48 2D A5 15 */ bl JUTReport_X1_
/* 800060EC 0000302C 48 2D A5 15 */ bl JUTReport__FiiiPCce
lbl_800060F0:
/* 800060F0 00003030 C0 0D 85 A4 */ lfs f0, lbl_80450B24-_SDA_BASE_(r13)
/* 800060F4 00003034 FC 00 00 1E */ fctiwz f0, f0
include/m_Do/m_Do_main/m_Do_main.h
+6 -2
View File
@@ -3,6 +3,7 @@
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
#include "JSystem/JUtility/JUTConsole/JUTConsole.h"
#include "dolphin/types.h"
class HeapCheck {
@@ -15,6 +16,9 @@ public:
JKRExpHeap* getHeap() { return heap; }
void setHeap(JKRExpHeap* i_heap) { heap = i_heap; }
void setHeapSize(u32 i_size) { heap_size = i_size; }
s32 getMaxTotalUsedSize() { return max_total_used_size; }
s32 getMaxTotalFreeSize() { return max_total_free_size; }
char** getNames() { return names; }
private:
/* 0x00 */ char* names[2];
@@ -38,8 +42,8 @@ extern HeapCheck lbl_803D32E0[8]; // RootHeapCheck
// extern HeapCheck lbl_803D33F8; // CommandHeapCheck
extern u8 lbl_80450B1A[2];
extern u8 lbl_80450B18;
extern u8 lbl_80450588[8];
extern u8 lbl_804511B8[4];
extern u8 lbl_80450588;
extern JUTConsole* lbl_804511B8;
extern u8 lbl_80451210[4];
extern JKRSolidHeap* lbl_80450BBC;
#endif