debugDisplay and Debug_console attemp

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
@@ -40,6 +40,7 @@ public:
static void changeGroupIdIfNeed(u8*, int);
static void mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static void dump(void);
static JKRAram* getManager() { return sAramObject; }
static JKRAramHeap* getAramHeap() { return getManager()->mAramHeap; }
@@ -67,6 +68,8 @@ private:
static JSUList<JKRAMCommand> sAramCommandList;
};
extern JKRAram* sAramObject__7JKRAram; // JKRAram::sAramObject
void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);
#endif
@@ -14,7 +14,7 @@
/* 802D1CA8 002CEBE8 3B A3 00 7F */ addi r29, r3, 0x7f
/* 802D1CAC 002CEBEC 41 82 00 34 */ beq lbl_802D1CE0
/* 802D1CB0 002CEBF0 7F 83 E3 78 */ mr r3, r28
/* 802D1CB4 002CEBF4 48 01 59 39 */ bl JUTConsole_NS_clear
/* 802D1CB4 002CEBF4 48 01 59 39 */ bl clear__10JUTConsoleFv
/* 802D1CB8 002CEBF8 7F 83 E3 78 */ mr r3, r28
/* 802D1CBC 002CEBFC 7F 24 CB 78 */ mr r4, r25
/* 802D1CC0 002CEC00 80 AD 8E 34 */ lwz r5, lbl_804513B4-_SDA_BASE_(r13)
@@ -78,11 +78,11 @@ lbl_802D1D60:
/* 802D1D8C 002CECCC EF E0 08 24 */ fdivs f31, f0, f1
/* 802D1D90 002CECD0 C0 02 C5 C0 */ lfs f0, lbl_80455FC0-_SDA2_BASE_(r2)
/* 802D1D94 002CECD4 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802D1D98 002CECD8 48 09 03 15 */ bl func_803620AC
/* 802D1D98 002CECD8 48 09 03 15 */ bl __cvt_fp2unsigned
/* 802D1D9C 002CECDC 7C 79 1B 78 */ mr r25, r3
/* 802D1DA0 002CECE0 C0 02 C5 C4 */ lfs f0, lbl_80455FC4-_SDA2_BASE_(r2)
/* 802D1DA4 002CECE4 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802D1DA8 002CECE8 48 09 03 05 */ bl func_803620AC
/* 802D1DA8 002CECE8 48 09 03 05 */ bl __cvt_fp2unsigned
/* 802D1DAC 002CECEC 38 80 00 0A */ li r4, 0xa
/* 802D1DB0 002CECF0 7C 03 23 96 */ divwu r0, r3, r4
/* 802D1DB4 002CECF4 7C 00 21 D6 */ mullw r0, r0, r4
@@ -238,7 +238,7 @@ lbl_80282BA8:
lbl_80282BC4:
/* 80282BC4 0027FB04 48 0E 95 39 */ bl func_8036C0FC
/* 80282BC8 0027FB08 D8 21 00 10 */ stfd f1, 0x10(r1)
/* 80282BCC 0027FB0C 48 0D F4 E1 */ bl func_803620AC
/* 80282BCC 0027FB0C 48 0D F4 E1 */ bl __cvt_fp2unsigned
/* 80282BD0 0027FB10 90 61 00 18 */ stw r3, 0x18(r1)
/* 80282BD4 0027FB14 7F E3 FB 78 */ mr r3, r31
/* 80282BD8 0027FB18 38 81 00 08 */ addi r4, r1, 8
@@ -0,0 +1,8 @@
#ifndef JSYSTEM_JUTILITY_JUTASSERT_H_
#define JSYSTEM_JUTILITY_JUTASSERT_H_
namespace JUTAssertion {
void setMessageCount(int message_count);
}
#endif
@@ -0,0 +1,92 @@
#ifndef JSYSTEM_JUTILITY_JUTCONSOLE_H_
#define JSYSTEM_JUTILITY_JUTCONSOLE_H_
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "JSystem/JSupport/JSUList/JSUList.h"
#include "JSystem/JUtility/JUTResFont.h"
#include "dolphin/types.h"
struct JKRDisposer_members {
struct JKRHeap* heap;
struct JSUPtrLink link;
};
struct TColor {
u8 r;
u8 g;
u8 b;
u8 a;
};
struct JUTResFont_vtable {
void* field_0x0;
void* field_0x4;
void* dtor;
void* setGX1;
void* setGX2;
void* drawChar_scale;
void* getLeading;
void* getAscent;
void* getDescent;
void* getHeight;
void* getWidth;
void* getWidthEntry;
void* getCellWidth;
void* getCellHeight;
void* getFontType;
void* getResFont;
void* isLeadByte;
void* loadImage;
void* setBlock;
};
class JUTConsole {
public:
void clear(void);
void scroll(int);
void dumpToTerminal(unsigned int);
int getLineOffset(void) const;
struct JUTConsole_vtable* vtable;
struct JKRDisposer_members base;
u8 field_0x18;
u8 field_0x19;
u8 field_0x1a;
u8 field_0x1b;
u8 field_0x1c;
u8 field_0x1d;
u8 field_0x1e;
u8 field_0x1f;
u32 field_0x20;
s32 field_0x24;
u8 field_0x28;
u8 field_0x29;
u8 field_0x2a;
u8 field_0x2b;
bool field_0x2c;
u8 field_0x2d;
u8 field_0x2e;
u8 field_0x2f;
s32 field_0x30;
s32 field_0x34;
s32 field_0x38;
u8 field_0x3c;
u8 field_0x3d;
u8 field_0x3e;
u8 field_0x3f;
s32 field_0x40;
s32 field_0x44;
s32 field_0x48;
struct JUTResFont* font;
float field_0x50;
float field_0x54;
u32 field_0x58;
struct TColor field_0x5c;
struct TColor field_0x60;
u32 field_0x64;
bool field_0x68;
bool field_0x69;
bool field_0x6a;
bool field_0x6b;
};
#endif
@@ -0,0 +1,7 @@
#ifndef JSYSTEM_JUTILITY_JUTREPORT_H
#define JSYSTEM_JUTILITY_JUTREPORT_H
void JUTReport(int, int, const char*, ...);
void JUTReport(int, int, int, const char*, ...);
#endif