encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

JUtility debug (#3020)

Browse Source
This commit is contained in:
Jcw87
2026-01-05 04:07:04 -08:00
committed by GitHub
parent e15ba03caa
commit 5b987084ea
39 changed files with 494 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/symbols.txt
+1 -1
View File
@@ -21544,7 +21544,7 @@ sReleasePoint__Q210JUTGamePad6CStick = .sdata:0x804508E4; // type:object size:0x
sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804508E8; // type:object size:0x4 scope:global align:4 data:4byte
sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804508EC; // type:object size:0x4 scope:global align:4 data:4byte
sMessageBuffer__12JUTException = .sdata:0x804508F0; // type:object size:0x4 scope:global align:4
sAssertVisible = .sdata:0x804508F8; // type:object size:0x1 scope:global align:1 data:byte
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x804508F8; // type:object size:0x1 scope:global align:1 data:byte
oneFrameRate = .sdata:0x80450900; // type:object size:0x4 scope:local align:4 data:float
oneFrameRateUser = .sdata:0x80450904; // type:object size:0x4 scope:local align:4 data:float
cm2hw$552 = .sdata:0x80450908; // type:object size:0x4 scope:local align:4
config/GZ2J01/symbols.txt
+1 -1
View File
@@ -21573,7 +21573,7 @@ sReleasePoint__Q210JUTGamePad6CStick = .sdata:0x8044AA24; // type:object size:0x
sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x8044AA28; // type:object size:0x4 scope:global align:4 data:4byte
sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x8044AA2C; // type:object size:0x4 scope:global align:4 data:4byte
sMessageBuffer__12JUTException = .sdata:0x8044AA30; // type:object size:0x4 scope:global align:4
sAssertVisible = .sdata:0x8044AA38; // type:object size:0x1 scope:global align:1 data:byte
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8044AA38; // type:object size:0x1 scope:global align:1 data:byte
oneFrameRate = .sdata:0x8044AA40; // type:object size:0x4 scope:local align:4 data:float
oneFrameRateUser = .sdata:0x8044AA44; // type:object size:0x4 scope:local align:4 data:float
cm2hw$552 = .sdata:0x8044AA48; // type:object size:0x4 scope:local align:4
config/GZ2P01/symbols.txt
+1 -1
View File
@@ -21585,7 +21585,7 @@ sReleasePoint__Q210JUTGamePad6CStick = .sdata:0x804528A4; // type:object size:0x
sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804528A8; // type:object size:0x4 scope:global align:4 data:4byte
sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804528AC; // type:object size:0x4 scope:global align:4 data:4byte
sMessageBuffer__12JUTException = .sdata:0x804528B0; // type:object size:0x4 scope:global align:4
sAssertVisible = .sdata:0x804528B8; // type:object size:0x1 data:byte
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x804528B8; // type:object size:0x1 data:byte
oneFrameRate = .sdata:0x804528C0; // type:object size:0x4 scope:local align:4 data:float
oneFrameRateUser = .sdata:0x804528C4; // type:object size:0x4 scope:local align:4 data:float
cm2hw$552 = .sdata:0x804528C8; // type:object size:0x4 scope:local align:4
config/ShieldD/symbols.txt
+4 -4
View File
@@ -63396,7 +63396,7 @@ __RTTI__12JUTException = .sdata:0x8074AE18; // type:object size:0x8 scope:global
@6861 = .sdata:0x8074AE20; // type:object size:0x3 scope:local data:string hash:0x0C9EC66C
sDisplayTime__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8074AE28; // type:object size:0x4 scope:global data:4byte hash:0x14776654 dhash:0xB02A20B5
sDevice__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8074AE2C; // type:object size:0x4 scope:global data:4byte hash:0xAB641663 dhash:0xDE80A722
lbl_8074AE30 = .sdata:0x8074AE30; // type:object size:0x1 data:byte hash:0xF164C2F5 dhash:0x13B63B34
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8074AE30; // type:object size:0x1 data:byte hash:0xF164C2F5 dhash:0x13B63B34
@21133 = .sdata:0x8074AE34; // type:object size:0x3 scope:local data:string hash:0xA0B9E9B7
@21184 = .sdata:0x8074AE38; // type:object size:0x4 scope:local data:string hash:0xA0B9EADB
@21235 = .sdata:0x8074AE3C; // type:object size:0x2 scope:local data:string hash:0xA0B9E5F2
@@ -64883,7 +64883,7 @@ lbl_8074CF80 = .sbss:0x8074CF80; // type:object size:0x1 data:byte hash:0x0135BA
sCurrentFifo__12JUTGraphFifo = .sbss:0x8074CF84; // type:object size:0x4 scope:global data:4byte hash:0x3E10453B dhash:0xADA054F8
mGpStatus__12JUTGraphFifo = .sbss:0x8074CF88; // type:object size:0x5 scope:global hash:0xE45701E9 dhash:0x776AE8CA
sDebugPrint__10JUTDbPrint = .sbss:0x8074CF90; // type:object size:0x4 scope:global data:4byte hash:0x80711BCB dhash:0x255411CA
lbl_8074CF98 = .sbss:0x8074CF98; // type:object size:0x1 data:byte hash:0x7D0B2177 dhash:0x111A89B6
mListInitialized__10JUTGamePad = .sbss:0x8074CF98; // type:object size:0x1 data:byte hash:0x7D0B2177 dhash:0x111A89B6
mPadAssign__10JUTGamePad = .sbss:0x8074CF9C; // type:object size:0x4 scope:global hash:0x7962D9AD dhash:0x16A8416C
sSuppressPadReset__10JUTGamePad = .sbss:0x8074CFA0; // type:object size:0x4 scope:global data:4byte hash:0x5E8C9776 dhash:0x876EE0B7
lbl_8074CFA4 = .sbss:0x8074CFA4; // type:object size:0x1 data:byte hash:0x79F03151 dhash:0x8212CF50
@@ -64894,7 +64894,7 @@ mEnabled__Q210JUTGamePad7CRumble = .sbss:0x8074CFB4; // type:object size:0x4 sco
sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFB8; // type:object size:0x4 scope:global data:4byte hash:0xF1111C3C dhash:0x5261607C
sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFBC; // type:object size:0x4 scope:global data:4byte hash:0xCC5C4708 dhash:0x77A84D68
sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC0; // type:object size:0x8 scope:global data:4byte hash:0xFCCCB7E2 dhash:0xE2BF2EC2
lbl_8074CFC8 = .sbss:0x8074CFC8; // type:object size:0x1 data:byte hash:0xBD6B48CC dhash:0x498A7ECC
sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC8; // type:object size:0x1 data:byte hash:0xBD6B48CC dhash:0x498A7ECC
sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC9; // type:object size:0x1 data:byte hash:0x878FC37B dhash:0xB3FB803B
sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFCC; // type:object size:0x4 scope:global data:4byte hash:0xEAB52F22 dhash:0x4A01E002
sErrorManager__12JUTException = .sbss:0x8074CFD0; // type:object size:0x4 scope:global data:4byte hash:0x6DF35642 dhash:0x528F3581
@@ -64909,7 +64909,7 @@ fpscr__12JUTException = .sbss:0x8074CFF0; // type:object size:0x4 scope:global d
sDirectPrint__14JUTDirectPrint = .sbss:0x8074CFF8; // type:object size:0x4 scope:global data:4byte hash:0xAD5B2218 dhash:0x2B49FC9D
sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8074D000; // type:object size:0x4 scope:global data:4byte hash:0xB70B9CD6 dhash:0x14F45BF7
sMessageOwner__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8074D004; // type:object size:0x4 scope:global data:4byte hash:0xBFF3EE31 dhash:0xB3683D70
lbl_8074D008 = .sbss:0x8074D008; // type:object size:0x1 data:byte hash:0xFA6CFDB7 dhash:0xEDED67B6
mSynchro__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8074D008; // type:object size:0x1 data:byte hash:0xFA6CFDB7 dhash:0xEDED67B6
sManager__8JUTVideo = .sbss:0x8074D010; // type:object size:0x4 scope:global data:4byte hash:0x55839787 dhash:0x9B46867F
sVideoLastTick__8JUTVideo = .sbss:0x8074D014; // type:object size:0x4 scope:global data:4byte hash:0xFF55AB9A dhash:0xA259C402
sVideoInterval__8JUTVideo = .sbss:0x8074D018; // type:object size:0x4 scope:global data:4byte hash:0xEBE85CBA dhash:0x5C483962
include/JSystem/JGadget/linklist.h
+4 -1
View File
@@ -234,7 +234,10 @@ struct TLinkList : TNodeLinkList {
const_iterator begin() const { return const_iterator(const_cast<TLinkList*>(this)->begin()); }
iterator end() { return iterator(TNodeLinkList::end()); }
const_iterator end() const { return const_iterator(const_cast<TLinkList*>(this)->end()); }
T& front() { return *begin(); }
T& front() {
JUT_ASSERT(642, !empty());
return *begin();
}
T& back() { JUT_ASSERT(652, !empty()); return *--end(); }
void pop_front() { erase(TNodeLinkList::begin()); }
void Push_front(T* element) { Insert(begin(), element); }
include/JSystem/JKernel/JKRHeap.h
+4
View File
@@ -210,6 +210,10 @@ inline void* operator new(size_t size, void* ptr) {
}
#endif
inline void* operator new[](size_t size, void* ptr) {
return ptr;
}
void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment);
inline void* JKRAllocFromHeap(JKRHeap* heap, u32 size, int alignment) {
include/JSystem/JSupport/JSUInputStream.h
+4
View File
@@ -89,6 +89,10 @@ public:
return *this;
}
s32 read(u8& val) {
return read(&val, sizeof(u8));
}
s32 read(u32& param_0) {
return read(&param_0, 4);
}
include/JSystem/JSupport/JSUList.h
+2
View File
@@ -100,6 +100,8 @@ public:
~JSUList() {}
void initiate() { JSUPtrList::initiate(); }
bool append(JSULink<T>* link) { return this->JSUPtrList::append((JSUPtrLink*)link); }
bool prepend(JSULink<T>* link) { return this->JSUPtrList::prepend((JSUPtrLink*)link); }
include/JSystem/JUtility/JUTAssert.h
-3
View File
@@ -78,7 +78,4 @@ namespace JUTAssertion {
}
};
extern bool sAssertVisible;
#endif /* JUTASSERT_H */
include/JSystem/JUtility/JUTCacheFont.h
+2 -1
View File
@@ -61,7 +61,8 @@ public:
void setPagingType(EPagingType type) { mPagingType = type; }
static u32 calcCacheSize(u32 param_0, int param_1) { return (ALIGN_NEXT(param_0, 0x20) + 0x40) * param_1; }
GXTexObj* getTexObj(void* buffer) { return &((TCachePage*)buffer)->mTexObj; }
GXTexObj* getTexObj(void* buffer) const { return &((TCachePage*)buffer)->mTexObj; }
void delete_and_initialize() { deleteMemBlocks_CacheFont(); initialize_state(); }
u32 getCachePage() const {
return mCachePage;
include/JSystem/JUtility/JUTConsole.h
+6 -3
View File
@@ -71,15 +71,18 @@ public:
bool isVisible() const { return mVisible; }
void setVisible(bool visible) { mVisible = visible; }
u8 getLineAttr(int param_0) { return mBuf[(field_0x20 + 2) * param_0]; }
u8 getLineAttr(int param_0) const { return mBuf[(field_0x20 + 2) * param_0]; }
void setLineAttr(int param_0, u8 param_1) { mBuf[(field_0x20 + 2) * param_0] = param_1; }
u8* getLinePtr(int param_0) const { return &mBuf[(field_0x20 + 2) * param_0] + 1; }
int diffIndex(int param_0, int param_1) const {
int result;
int diff = param_1 - param_0;
if (diff >= 0) {
return diff;
result = diff;
} else {
result = diff + mMaxLines;
}
return diff += mMaxLines;
return result;
}
int prevIndex(int index) const {
include/JSystem/JUtility/JUTDbPrint.h
+2 -2
View File
@@ -28,10 +28,10 @@ public:
JUTDbPrint(JUTFont*, JKRHeap*);
static JUTDbPrint* start(JUTFont*, JKRHeap*);
JUTFont* changeFont(JUTFont*);
void enter(int, int, int, char const*, int);
void enter(int, int, int, const char*, int);
void flush(int, int, int, int);
void flush();
void drawString(int, int, int, u8 const*);
void drawString(int, int, int, const u8*);
static JUTDbPrint* getManager() { return sDebugPrint; }
include/JSystem/JUtility/JUTDirectFile.h
+2
View File
@@ -17,6 +17,8 @@ struct JUTDirectFile {
void fclose();
int fgets(void*, int);
bool isOpened() const { return mIsOpen; }
/* 0x000 */ u8 mBuffer[0x820];
/* 0x820 */ u8* mSectorStart;
/* 0x824 */ u32 mToRead;
include/JSystem/JUtility/JUTException.h
+1 -1
View File
@@ -57,7 +57,7 @@ public:
class JUTExMapFile {
public:
JUTExMapFile(char* path) : mLink(this) { mPath = path; }
JUTExMapFile(const char* path) : mLink(this) { mPath = const_cast<char*>(path); }
public:
/* 0x00 */ char* mPath;
include/JSystem/JUtility/JUTFont.h
+6 -2
View File
@@ -114,8 +114,8 @@ public:
drawString_size(posX, posY, str, strlen(str), visible);
}
void drawString_size(int posX, int posY, const char* str, u32 len, bool visible) {
drawString_size_scale(posX, posY, getWidth(), getHeight(), str, len, visible);
s32 drawString_size(int posX, int posY, const char* str, u32 len, bool visible) {
return drawString_size_scale(posX, posY, getWidth(), getHeight(), str, len, visible);
}
void drawString_scale(f32 posX, f32 posY, f32 width, f32 height, const char* str,
@@ -132,6 +132,10 @@ public:
bool isValid() const { return mValid; }
bool isFixed() const { return mFixed; }
int getFixedWidth() const { return mFixedWidth; }
void setFixedWidth(bool fixed, int width) {
mFixed = fixed;
mFixedWidth = width;
}
int getOffset(int i_no) const {
JUTFont::TWidth width;
getWidthEntry(i_no, &width);
include/JSystem/JUtility/JUTGamePad.h
+18 -4
View File
@@ -61,6 +61,7 @@ public:
void checkResetCallback(OSTime holdTime);
void update();
void stopPatternedRumble() { mRumble.stopPatternedRumble(mPortNum); }
void setButtonRepeat(u32, u32, u32);
static void checkResetSwitch();
static void clearForReset();
@@ -72,6 +73,8 @@ public:
PADSetAnalogMode(mode);
}
static int getClampMode() { return sClampMode; }
static void clearResetOccurred() { C3ButtonReset::sResetOccurred = false; }
static void setResetCallback(callbackFn callback, void* arg) {
@@ -111,7 +114,7 @@ public:
void stopMotorWave() { mRumble.stopPatternedRumbleAtThePeriod(); }
void stopMotor() { mRumble.stopMotor(mPortNum, false); }
void stopMotorHard() { mRumble.stopMotorHard(mPortNum); }
void stopMotorHard() { CRumble::stopMotorHard(mPortNum); }
static s8 getPortStatus(EPadPort port) {
JUT_ASSERT(360, 0 <= port && port < 4);
@@ -181,7 +184,7 @@ public:
CRumble(JUTGamePad* pad) { clear(pad); }
static u32 sChannelMask[4];
static bool mStatus[4];
static u8 mStatus[4];
static u32 mEnabled;
enum ERumble {
@@ -201,9 +204,18 @@ public:
void stopPatternedRumbleAtThePeriod();
static void setEnabled(u32 mask);
void stopMotorHard(int port) { stopMotor(port, true); }
static void stopMotor(int port) { stopMotor(port, false); }
static void stopMotorHard(int port) { stopMotor(port, true); }
static bool isEnabled(u32 mask) { return mEnabled & mask; }
static bool isEnabled(u32 mask) {
bool result;
if (mEnabled & mask) {
result = true;
} else {
result = false;
}
return result;
}
static bool isEnabledPort(int port) {
JUT_ASSERT(250, 0 <= port && port < 4);
@@ -274,4 +286,6 @@ struct JUTGamePadLongPress {
/* 0x50 */ s32 field_0x50;
};
inline void JUTReadGamePad() { JUTGamePad::read(); }
#endif /* JUTGAMEPAD_H */
include/JSystem/JUtility/JUTGraphFifo.h
+3 -2
View File
@@ -13,12 +13,13 @@ public:
virtual ~JUTGraphFifo();
void getGpStatus() {
static bool* getGpStatus() {
GXGetGPStatus((GXBool*)&mGpStatus[0], (GXBool*)&mGpStatus[1], (GXBool*)&mGpStatus[2],
(GXBool*)&mGpStatus[3], (GXBool*)&mGpStatus[4]);
return mGpStatus;
}
bool isGPActive() {
static bool isGPActive() {
getGpStatus();
return mGpStatus[2] == false;
}
include/JSystem/JUtility/JUTPalette.h
+7 -7
View File
@@ -21,7 +21,7 @@ struct ResTLUT {
*/
class JUTPalette {
public:
JUTPalette(_GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) {
JUTPalette(GXTlut p1, GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) {
this->storeTLUT(p1, p2, p3, p4, p5);
}
@@ -29,18 +29,18 @@ public:
storeTLUT(tlutNo, p_tlutRes);
}
void storeTLUT(_GXTlut, ResTLUT*);
void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*);
void storeTLUT(GXTlut, ResTLUT*);
void storeTLUT(GXTlut, GXTlutFmt, JUTTransparency, u16, void*);
bool load();
u8 getTlutName() const { return mTlutName; }
u8 getFormat() const { return mFormat; }
u8 getTransparency() const { return mTransparency; }
GXTlut getTlutName() const { return GXTlut(mTlutName); }
GXTlutFmt getFormat() const { return GXTlutFmt(mFormat); }
JUTTransparency getTransparency() const { return JUTTransparency(mTransparency); }
u16 getNumColors() const { return mNumColors; }
ResTLUT* getColorTable() const { return mColorTable; }
private:
/* 0x00 */ _GXTlutObj mTlutObj;
/* 0x00 */ GXTlutObj mTlutObj;
/* 0x0C */ u8 mTlutName;
/* 0x0D */ u8 mFormat;
/* 0x10 */ ResTLUT* mColorTable;
include/JSystem/JUtility/JUTProcBar.h
+1
View File
@@ -62,6 +62,7 @@ public:
/* 0x0C */ int mWidth;
/* 0x10 */ int mUserPosition;
CParamSet() {}
void setBarWidth(int width) { mBarWidth = width; }
void setPosition(int x, int y) {
mPosX = x;
include/JSystem/JUtility/JUTTexture.h
+5 -5
View File
@@ -59,14 +59,14 @@ public:
}
~JUTTexture();
void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut);
void storeTIMG(ResTIMG const*, JUTPalette*, GXTlut);
void storeTIMG(ResTIMG const*, u8);
void storeTIMG(ResTIMG const*, JUTPalette*);
void attachPalette(JUTPalette*);
void init();
void initTexObj(_GXTlut);
void initTexObj(GXTlut);
void initTexObj();
void load(_GXTexMapID);
void load(GXTexMapID);
const ResTIMG* getTexInfo() const { return mTexInfo; }
s32 getFormat() const { return mTexInfo->format; }
@@ -74,8 +74,8 @@ public:
s32 getWidth() const { return mTexInfo->width; }
s32 getHeight() const { return mTexInfo->height; }
void setCaptureFlag(bool flag) { mFlags &= 2 | flag; }
u8 getCaptureFlag() const { return mFlags & 1; }
u8 getEmbPaletteDelFlag() const { return mFlags & 2; }
bool getCaptureFlag() const { return mFlags & 1; }
bool getEmbPaletteDelFlag() const { return mFlags & 2; }
void setEmbPaletteDelFlag(bool flag) { mFlags = (mFlags & 1) | (flag << 1);}
int getTlutName() const { return mTlutName; }
bool operator==(const JUTTexture& other) {

Some files were not shown because too many files have changed in this diff Show More