mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-11 05:04:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from TakaRikka/26-02-24-error-fix

Browse Source 
Error handling fixes
This commit is contained in:
TakaRikka
2026-02-24 14:04:10 -08:00
committed by GitHub
parent 7f4d6a91d3 5d496baee4
commit 0e7339f36b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JUtility/JUTAssert.cpp
+5
View File
@@ -90,6 +90,10 @@ void showAssert_f_va(u32 device, const char* file, int line, const char* msg, va
sMessageLife = -1;
vsnprintf(sMessageString, 255, msg, args);
#if TARGET_PC
OSReport_Error("Failed assertion: %s:%d\n", file, line);
OSReport_Error("%s\n", sMessageString);
#else
if (device & 2) {
OSReport("Failed assertion: %s:%d\n", file, line);
OSReport("%s\n", sMessageString);
@@ -121,6 +125,7 @@ void showAssert_f_va(u32 device, const char* file, int line, const char* msg, va
}
}
}
#endif
}
void showAssert_f(u32 device, const char* file, int line, const char* msg, ...) {
src/m_Do/m_Do_printf.cpp
+4 -1
View File
@@ -293,7 +293,9 @@ void OSPanic(const char* file, int line, const char* fmt, ...) {
mDoPrintf_vprintf(fmt, args);
va_end(args);
OSAttention(" in \"%s\" on line %d.\n", file, line);
#if TARGET_PC
abort();
#else
OSAttention("\nAddress: Back Chain LR Save\n");
for (i = 0, p = (u32*)OSGetStackPointer(); p && (uintptr_t)p != 0xFFFFFFFF && i++ < 16; p = (u32*)*p) {
OSAttention("0x%08x: 0x%08x 0x%08x\n", p, p[0], p[1]);
@@ -303,4 +305,5 @@ void OSPanic(const char* file, int line, const char* fmt, ...) {
tmp = (u32*)0x1234567;
*tmp = (uintptr_t)tmp;
PPCHalt();
#endif
}