db_exception

This commit is contained in:
robojumper
2024-05-25 12:48:53 +02:00
parent 101f014078
commit 09eebc77b3
9 changed files with 1030 additions and 26 deletions
+15
View File
@@ -338,6 +338,21 @@ nw4r/db/db_directPrint.cpp:
.sbss start:0x805765E8 end:0x805765EC
.bss start:0x80636B80 end:0x80636BA4
nw4r/db/db_console.cpp:
.text start:0x80434EA0 end:0x8043598C
.data start:0x8056C010 end:0x8056C038
.sdata start:0x80574DC8 end:0x80574DD0
.sbss start:0x805765F0 end:0x805765F8
.bss start:0x80636BA8 end:0x80636FC0
nw4r/db/db_exception.cpp:
.text start:0x80435990 end:0x80436A48
.data start:0x8056C038 end:0x8056C5F0
.sdata start:0x80574DD0 end:0x80574E10
.sbss start:0x805765F8 end:0x80576600
.sdata2 start:0x8057EBA8 end:0x8057EBAC
.bss start:0x80636FC0 end:0x8063B320
nw4r/db/db_mapFile.cpp:
.text start:0x80436A50 end:0x804373B4
.data start:0x8056C5F0 end:0x8056C600
+67 -22
View File
@@ -21979,7 +21979,7 @@ OSSearchModule = .text:0x803A9F50; // type:function size:0xA4
OSInitMessageQueue = .text:0x803AA000; // type:function size:0x60
OSSendMessage = .text:0x803AA060; // type:function size:0xC8
OSReceiveMessage = .text:0x803AA130; // type:function size:0xDC
fn_803AA210 = .text:0x803AA210; // type:function size:0xC
OSGetPhysicalMem1Size = .text:0x803AA210; // type:function size:0xC
OSGetPhysicalMem2Size = .text:0x803AA220; // type:function size:0xC scope:global
OSGetConsoleSimulatedMem1Size = .text:0x803AA230; // type:function size:0xC scope:global
OSGetConsoleSimulatedMem2Size = .text:0x803AA240; // type:function size:0xC scope:global
@@ -24153,7 +24153,7 @@ DirectPrint_SetupFB__Q34nw4r2db6detailFPC16_GXRenderModeObj = .text:0x80434CB0;
RemoveConsoleFromList___Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x80434EA0; // type:function size:0xB0
Console_Create__Q24nw4r2dbFPvUsUsUsUsUs = .text:0x80434F50; // type:function size:0x1B0
Console_Destroy__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x80435100; // type:function size:0x30
DoDrawConsole___Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadPQ34nw4r2ut17TextWriterBase = .text:0x80435130; // type:function size:0x1A4
DoDrawConsole___Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadPQ34nw4r2ut17TextWriterBase<c> = .text:0x80435130; // type:function size:0x1A4
Console_DrawDirect__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x804352E0; // type:function size:0x7C
PrintToBuffer___Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadPCUc = .text:0x80435360; // type:function size:0x3B8
Console_VFPrintf__Q24nw4r2dbFQ34nw4r2db17ConsoleOutputTypePQ44nw4r2db6detail11ConsoleHeadPCcP16__va_list_struct = .text:0x80435720; // type:function size:0xD8
@@ -27471,7 +27471,7 @@ _restgpr_29 = .text:0x804C6BE0; // type:label scope:global
_restgpr_30 = .text:0x804C6BE4; // type:label scope:global
_restgpr_31 = .text:0x804C6BE8; // type:label scope:global
__div2u = .text:0x804C6BF0; // type:function size:0xEC scope:global
fn_804C6CDC = .text:0x804C6CDC; // type:function size:0x138
__div2i = .text:0x804C6CDC; // type:function size:0x138
__mod2u = .text:0x804C6E14; // type:function size:0xE4 scope:global
fn_804C6EF8 = .text:0x804C6EF8; // type:function size:0x10C
fn_804C7004 = .text:0x804C7004; // type:function size:0x24
@@ -36957,20 +36957,65 @@ __vt__Q34nw4r2ut4Font = .data:0x8056BED8; // type:object size:0x5C scope:weak
__vt__Q44nw4r2ut6detail11ResFontBase = .data:0x8056BF44; // type:object size:0x5C
__vt__Q34nw4r2ut7ResFont = .data:0x8056BFA0; // type:object size:0x5C
twiceBit__Q24nw4r2db = .data:0x8056C000; // type:object size:0x10 scope:local
lbl_8056C010 = .data:0x8056C010; // type:object size:0x10
lbl_8056C020 = .data:0x8056C020; // type:object size:0x18
lbl_8056C038 = .data:0x8056C038; // type:object size:0x10
lbl_8056C048 = .data:0x8056C048; // type:object size:0x10
lbl_8056C058 = .data:0x8056C058; // type:object size:0x14
lbl_8056C06C = .data:0x8056C06C; // type:object size:0xC
lbl_8056C078 = .data:0x8056C078; // type:object size:0x10
lbl_8056C010 = .data:0x8056C010; // type:object size:0xF data:string
lbl_8056C020 = .data:0x8056C020; // type:object size:0x17 data:string
lbl_8056C038 = .data:0x8056C038; // type:object size:0xD data:string
lbl_8056C048 = .data:0x8056C048; // type:object size:0xE data:string
lbl_8056C058 = .data:0x8056C058; // type:object size:0x13 data:string
lbl_8056C06C = .data:0x8056C06C; // type:object size:0xA data:string
lbl_8056C078 = .data:0x8056C078; // type:object size:0xF data:string
lbl_8056C088 = .data:0x8056C088; // type:object size:0xC data:string
lbl_8056C094 = .data:0x8056C094; // type:object size:0xC data:string
lbl_8056C0A0 = .data:0x8056C0A0; // type:object size:0x14
lbl_8056C0A0 = .data:0x8056C0A0; // type:object size:0x13 data:string
lbl_8056C0B4 = .data:0x8056C0B4; // type:object size:0xC data:string
lbl_8056C0C0 = .data:0x8056C0C0; // type:object size:0x14
lbl_8056C0D4 = .data:0x8056C0D4; // type:object size:0x14
lbl_8056C0E8 = .data:0x8056C0E8; // type:object size:0x508
lbl_8056C0C0 = .data:0x8056C0C0; // type:object size:0x11 data:string
lbl_8056C0D4 = .data:0x8056C0D4; // type:object size:0x12 data:string
lbl_8056C0E8 = .data:0x8056C0E8; // type:object size:0xB data:string
lbl_8056C0F4 = .data:0x8056C0F4; // type:object size:0x44
lbl_8056C138 = .data:0x8056C138; // type:object size:0x37 data:string
lbl_8056C170 = .data:0x8056C170; // type:object size:0x2D data:string
lbl_8056C1A0 = .data:0x8056C1A0; // type:object size:0x10 data:string
lbl_8056C1B0 = .data:0x8056C1B0; // type:object size:0x1A data:string
lbl_8056C1CC = .data:0x8056C1CC; // type:object size:0x26 data:string
lbl_8056C1F4 = .data:0x8056C1F4; // type:object size:0x27 data:string
lbl_8056C21C = .data:0x8056C21C; // type:object size:0x1A data:string
lbl_8056C238 = .data:0x8056C238; // type:object size:0x1E data:string
lbl_8056C258 = .data:0x8056C258; // type:object size:0x2A data:string
lbl_8056C284 = .data:0x8056C284; // type:object size:0xD data:string
lbl_8056C294 = .data:0x8056C294; // type:object size:0x11 data:string
lbl_8056C2A8 = .data:0x8056C2A8; // type:object size:0x1D data:string
lbl_8056C2C8 = .data:0x8056C2C8; // type:object size:0x1A data:string
lbl_8056C2E4 = .data:0x8056C2E4; // type:object size:0x1C data:string
lbl_8056C300 = .data:0x8056C300; // type:object size:0x1C data:string
lbl_8056C320 = .data:0x8056C320; // type:object size:0x28 data:string
lbl_8056C348 = .data:0x8056C348; // type:object size:0x15 data:string
lbl_8056C360 = .data:0x8056C360; // type:object size:0x9 data:string
lbl_8056C36C = .data:0x8056C36C; // type:object size:0x22 data:string
lbl_8056C390 = .data:0x8056C390; // type:object size:0x1F data:string
lbl_8056C3B0 = .data:0x8056C3B0; // type:object size:0xF data:string
lbl_8056C3C0 = .data:0x8056C3C0; // type:object size:0x19 data:string
lbl_8056C3DC = .data:0x8056C3DC; // type:object size:0x16 data:string
lbl_8056C3F4 = .data:0x8056C3F4; // type:object size:0x16 data:string
lbl_8056C40C = .data:0x8056C40C; // type:object size:0xF data:string
lbl_8056C41C = .data:0x8056C41C; // type:object size:0x12 data:string
lbl_8056C430 = .data:0x8056C430; // type:object size:0x13 data:string
lbl_8056C444 = .data:0x8056C444; // type:object size:0x16 data:string
lbl_8056C45C = .data:0x8056C45C; // type:object size:0x1A data:string
lbl_8056C478 = .data:0x8056C478; // type:object size:0x10 data:string
lbl_8056C488 = .data:0x8056C488; // type:object size:0x11 data:string
lbl_8056C49C = .data:0x8056C49C; // type:object size:0x15 data:string
lbl_8056C4B4 = .data:0x8056C4B4; // type:object size:0x16 data:string
lbl_8056C4CC = .data:0x8056C4CC; // type:object size:0x1C data:string
lbl_8056C4E8 = .data:0x8056C4E8; // type:object size:0x1C data:string
lbl_8056C504 = .data:0x8056C504; // type:object size:0x29 data:string
lbl_8056C530 = .data:0x8056C530; // type:object size:0xE data:string
lbl_8056C540 = .data:0x8056C540; // type:object size:0x26 data:string
lbl_8056C568 = .data:0x8056C568; // type:object size:0x26 data:string
lbl_8056C590 = .data:0x8056C590; // type:object size:0x11 data:string
lbl_8056C5A4 = .data:0x8056C5A4; // type:object size:0x11 data:string
lbl_8056C5B8 = .data:0x8056C5B8; // type:object size:0x11 data:string
lbl_8056C5CC = .data:0x8056C5CC; // type:object size:0x11 data:string
lbl_8056C5E0 = .data:0x8056C5E0; // type:object size:0xC data:string
lbl_8056C5F0 = .data:0x8056C5F0; // type:object size:0xD data:string
lbl_8056C600 = .data:0x8056C600; // type:object size:0x108
lbl_8056C708 = .data:0x8056C708; // type:object size:0x808
@@ -39549,17 +39594,17 @@ lbl_80574DB8 = .sdata:0x80574DB8; // type:object size:0x8 data:byte
mFormatBufferSize__Q34nw4r2ut17TextWriterBase<c> = .sdata:0x80574DC0; // type:object size:0x4 scope:weak data:4byte
mFormatBufferSize__Q34nw4r2ut17TextWriterBase<w> = .sdata:0x80574DC4; // type:object size:0x4 scope:weak data:4byte
lbl_80574DC8 = .sdata:0x80574DC8; // type:object size:0x4 data:string
lbl_80574DCC = .sdata:0x80574DCC; // type:object size:0x4
lbl_80574DCC = .sdata:0x80574DCC; // type:object size:0x3 data:string
lbl_80574DD0 = .sdata:0x80574DD0; // type:object size:0x4 data:string
lbl_80574DD4 = .sdata:0x80574DD4; // type:object size:0x4 data:string
lbl_80574DD8 = .sdata:0x80574DD8; // type:object size:0x8 data:string
lbl_80574DE0 = .sdata:0x80574DE0; // type:object size:0x8
lbl_80574DE0 = .sdata:0x80574DE0; // type:object size:0x6 data:string
lbl_80574DE8 = .sdata:0x80574DE8; // type:object size:0x4 data:string
lbl_80574DEC = .sdata:0x80574DEC; // type:object size:0x8
lbl_80574DF4 = .sdata:0x80574DF4; // type:object size:0x4
lbl_80574DF8 = .sdata:0x80574DF8; // type:object size:0x8
lbl_80574DEC = .sdata:0x80574DEC; // type:object size:0x6 data:string
lbl_80574DF4 = .sdata:0x80574DF4; // type:object size:0x2 data:string
lbl_80574DF8 = .sdata:0x80574DF8; // type:object size:0x7 data:string
lbl_80574E00 = .sdata:0x80574E00; // type:object size:0x8 data:string
lbl_80574E08 = .sdata:0x80574E08; // type:object size:0x8
lbl_80574E08 = .sdata:0x80574E08; // type:object size:0x2 data:string
lbl_80574E10 = .sdata:0x80574E10; // type:object size:0x4 data:4byte
lbl_80574E14 = .sdata:0x80574E14; // type:object size:0x4 data:4byte
lbl_80574E18 = .sdata:0x80574E18; // type:object size:0x4 data:4byte
@@ -40834,7 +40879,7 @@ mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase<w> = .sbss:0x805765DC; // type:
sInitialized__Q24nw4r2db = .sbss:0x805765E8; // type:object size:0x4 scope:local data:4byte
lbl_805765F0 = .sbss:0x805765F0; // type:object size:0x4 data:4byte
lbl_805765F4 = .sbss:0x805765F4; // type:object size:0x1 data:byte
lbl_805765F8 = .sbss:0x805765F8; // type:object size:0x8
sMessageBuffer__Q24nw4r2db = .sbss:0x805765F8; // type:object size:0x8
sFileLength__Q24nw4r2db = .sbss:0x80576600; // type:object size:0x4 scope:local data:4byte
sMapFileList__Q24nw4r2db = .sbss:0x80576604; // type:object size:0x4 scope:local data:4byte
GetCharPtr___Q24nw4r2db = .sbss:0x80576608; // type:object size:0x4 scope:local data:4byte
@@ -47248,7 +47293,7 @@ lbl_8057EB90 = .sdata2:0x8057EB90; // type:object size:0x4 scope:local data:floa
lbl_8057EB94 = .sdata2:0x8057EB94; // type:object size:0x4 scope:local data:float
lbl_8057EB98 = .sdata2:0x8057EB98; // type:object size:0x8 scope:local data:double
lbl_8057EBA0 = .sdata2:0x8057EBA0; // type:object size:0x4 scope:local data:float
lbl_8057EBA8 = .sdata2:0x8057EBA8; // type:object size:0x8 data:float
lbl_8057EBA8 = .sdata2:0x8057EBA8; // type:object size:0x4 data:float
lbl_8057EBB0 = .sdata2:0x8057EBB0; // type:object size:0x4 data:float
lbl_8057EBB4 = .sdata2:0x8057EBB4; // type:object size:0x4 data:float
lbl_8057EBB8 = .sdata2:0x8057EBB8; // type:object size:0x4 data:float
+2
View File
@@ -329,6 +329,8 @@ config.libs = [
[
Object(Matching, "nw4r/db/db_assert.cpp"),
Object(Matching, "nw4r/db/db_directPrint.cpp"),
Object(Matching, "nw4r/db/db_console.cpp"),
Object(Matching, "nw4r/db/db_exception.cpp"),
Object(Matching, "nw4r/db/db_mapFile.cpp"),
],
),
+39 -1
View File
@@ -1,14 +1,52 @@
#ifndef NW4R_DB_CONSOLE_H
#define NW4R_DB_CONSOLE_H
#include <common.h>
#include <nw4r/ut/ut_TextWriterBase.h>
namespace nw4r {
namespace db {
namespace detail {
struct ConsoleHead {};
typedef struct ConsoleHead {
u8 *textBuf;
u16 width;
u16 height;
u16 priority;
u16 attr;
u16 printTop;
u16 printXPos;
u16 ringTop;
u32 ringTopLineCnt;
s32 viewTopLine;
s16 viewPosX;
s16 viewPosY;
u16 viewLines;
bool isVisible;
nw4r::ut::TextWriterBase<char> *writer;
ConsoleHead *next;
} ConsoleHead;
} // namespace detail
typedef detail::ConsoleHead *ConsoleHandle;
enum ConsoleOutputType {
CONSOLE_OUTPUT_NONE = 0,
CONSOLE_OUTPUT_DISPLAY = 1,
CONSOLE_OUTPUT_TERMINAL = 2,
CONSOLE_OUTPUT_ALL = CONSOLE_OUTPUT_DISPLAY | CONSOLE_OUTPUT_TERMINAL,
};
ConsoleHandle Console_Create(void *arg, u16, u16, u16, u16, u16);
ConsoleHandle Console_Destroy(ConsoleHandle console);
void Console_DrawDirect(ConsoleHandle console);
void Console_VFPrintf(ConsoleOutputType type, ConsoleHandle console, const char* format, va_list vlist);
void Console_Printf(ConsoleHandle console, const char* format, ...);
s32 Console_GetTotalLines(ConsoleHandle console);
} // namespace db
} // namespace nw4r
#endif
+26
View File
@@ -0,0 +1,26 @@
#ifndef NW4R_DB_EXCEPTION_H
#define NW4R_DB_EXCEPTION_H
#include <nw4r/db/db_console.h>
#include <rvl/OS.h>
namespace nw4r {
namespace db {
typedef struct {
u16 error;
OSContext *ctx;
u32 dsisr;
u32 dar;
} ExceptionCallbackParam;
void Exception_Init();
ConsoleHandle Exception_SetConsole(ConsoleHandle, const _GXRenderModeObj *);
ConsoleHandle Exception_GetConsole();
void Exception_SetUserCallback(bool (*)(ConsoleHandle, void *), void *);
} // namespace db
} // namespace nw4r
#endif
+1 -1
View File
@@ -36,7 +36,7 @@ typedef enum {
OS_ERR_MAX
} OSErrorType;
typedef void (*OSErrorHandler)(u8 error, OSContext *ctx, u32 dsisr, u32 dar, ...);
typedef void (*OSErrorHandler)(u16 error, OSContext *ctx, u32 dsisr, u32 dar);
extern OSErrorHandler __OSErrorTable[OS_ERR_MAX];
extern u32 __OSFpscrEnableBits;
+380
View File
@@ -0,0 +1,380 @@
#include <common.h>
#include <nw4r/db/db_console.h>
#include <nw4r/db/db_directPrint.h>
#include <nw4r/ut/ut_TextWriterBase.h>
#include <rvl/OS.h>
namespace nw4r {
namespace db {
static ConsoleHandle sConsoleList;
static OSMutex sMutex;
static u8 buf[0x400];
bool sInited;
static ConsoleHandle FindInsertionPosition_(u16 priority) {
ConsoleHandle cursor = sConsoleList;
if (cursor == nullptr || cursor->priority < priority) {
return nullptr;
}
while (cursor->next != nullptr) {
if (cursor->next->priority < priority) {
return cursor;
}
cursor = cursor->next;
}
return cursor;
}
static void Console_Append_(ConsoleHandle console) {
OSLockMutex(&sMutex);
ConsoleHandle cursor = FindInsertionPosition_(console->priority);
if (cursor == nullptr) {
console->next = sConsoleList;
sConsoleList = console;
} else {
console->next = cursor->next;
cursor->next = console;
}
OSUnlockMutex(&sMutex);
}
void RemoveConsoleFromList_(ConsoleHandle console) {
OSLockMutex(&sMutex);
if (sConsoleList == console) {
sConsoleList = console->next;
console->next = nullptr;
} else {
ConsoleHandle cursor = sConsoleList;
while (cursor->next != nullptr) {
if (cursor->next == console) {
cursor->next = console->next;
console->next = nullptr;
goto end;
}
cursor = cursor->next;
}
#line 386
OSError("illegal console handle");
}
end:
OSUnlockMutex(&sMutex);
}
static bool TryLockMutex_(OSMutex *mutex) {
if (OSGetCurrentThread() != nullptr) {
OSLockMutex(&sMutex);
return true;
}
if (mutex->thread == nullptr) {
return true;
}
return false;
}
static void UnlockMutex_(OSMutex *mutex) {
if (OSGetCurrentThread() != nullptr) {
OSUnlockMutex(&sMutex);
}
}
ConsoleHandle Console_Create(void *arg, u16 width, u16 height, u16 viewLines, u16 priority, u16 attr) {
ConsoleHandle console = (ConsoleHandle)arg;
if (!sInited) {
OSInitMutex(&sMutex);
sInited = true;
}
console->textBuf = (u8 *)(console + 1);
console->width = width;
console->height = height;
console->priority = priority;
console->attr = attr;
console->isVisible = false;
console->printTop = 0;
console->printXPos = 0;
console->ringTop = 0;
console->ringTopLineCnt = 0;
console->viewTopLine = 0;
console->viewPosX = 0x1e;
console->viewPosY = 0x32;
console->viewLines = viewLines;
console->writer = nullptr;
if (TryLockMutex_(&sMutex)) {
BOOL intr = OSDisableInterrupts();
console->printTop = 0;
console->printXPos = 0;
console->ringTop = 0;
console->ringTopLineCnt = 0;
console->viewTopLine = 0;
OSRestoreInterrupts(intr);
UnlockMutex_(&sMutex);
}
Console_Append_(console);
return console;
}
ConsoleHandle Console_Destroy(ConsoleHandle console) {
RemoveConsoleFromList_(console);
return console;
}
static u8 *GetTextPtr_(ConsoleHandle console, u16 line, u16 xPos) {
return &console->textBuf[(console->width + 1) * line + xPos];
}
static u16 GetRingUsedLines_(ConsoleHandle console) {
s32 lines = console->printTop - console->ringTop;
if (lines < 0) {
lines += console->height;
}
return lines;
}
static u16 GetActiveLines_(ConsoleHandle console) {
u16 lines = GetRingUsedLines_(console);
if (console->printXPos != 0) {
lines += 1;
}
return lines;
}
static void DoDrawString_(ConsoleHandle console, u32 printLine, const u8 *str, nw4r::ut::TextWriterBase<char> *writer) {
if (writer != nullptr) {
writer->Printf("%s\n", str);
} else {
s32 height = console->viewPosY + printLine * 10;
db::DirectPrint_DrawString(console->viewPosX, height, false, "%s\n",
str);
}
}
static void DoDrawConsole_(ConsoleHandle console, nw4r::ut::TextWriterBase<char> *writer) {
// I guess we don't care if locking the mutex fails??
TryLockMutex_(&sMutex);
s32 viewOffset = console->viewTopLine - console->ringTopLineCnt;
u16 line;
u16 printLines = 0;
u16 topLine;
if (viewOffset < 0) {
viewOffset = 0;
} else if (viewOffset > GetActiveLines_(console)) {
goto err;
}
line = console->ringTop + viewOffset;
if ( line >= console->height )
{
line -= console->height;
}
topLine = console->printTop + ((console->printXPos > 0) ? 1 : 0);
if (topLine == console->height) {
topLine = 0;
}
while (line != topLine) {
DoDrawString_(console, printLines, GetTextPtr_(console, line, 0), writer);
printLines++;
line++;
if (line == console->height) {
if ((console->attr & 2) != 0) {
break;
}
line = 0;
}
if (printLines >= console->viewLines) {
break;
}
}
err:
UnlockMutex_(&sMutex);
}
void Console_DrawDirect(ConsoleHandle console) {
if (DirectPrint_IsActive() && console->isVisible) {
DirectPrint_EraseXfb(console->viewPosX - 6, console->viewPosY - 3, console->width * 6 + 12,
console->viewLines * 10 + 4);
DoDrawConsole_(console, nullptr);
DirectPrint_StoreCache();
}
}
static void TerminateLine_(ConsoleHandle console) {
*GetTextPtr_(console, console->printTop, console->printXPos) = '\0';
}
static u32 GetTabSize_(ConsoleHandle console) {
s32 tab = (console->attr & 12) >> 2;
return 2 << tab;
}
static u32 CodeWidth_(const u8 *p) {
return (*p >= 0x81) ? 2 : 1;
}
static u32 PutChar_(ConsoleHandle console, const u8 *str, u8 *dstPtr) {
u32 codeWidth;
u32 count;
codeWidth = CodeWidth_(str);
if (console->printXPos + codeWidth > console->width) {
return 0;
} else {
console->printXPos += codeWidth;
for (count = codeWidth; count > 0; count--) {
*dstPtr++ = *str++;
}
return codeWidth;
}
}
static u8 *PutTab_(ConsoleHandle console, u8 *dstPtr) {
u32 tabWidth = GetTabSize_(console);
do {
*dstPtr++ = ' ';
console->printXPos++;
if (console->printXPos >= console->width) {
break;
}
} while ((console->printXPos & (tabWidth - 1)) != 0);
return dstPtr;
}
static u8 *SearchEndOfLine_(const u8 *str) {
while (*str != '\n' && *str != '\0') {
str++;
}
return (u8 *)str;
}
static u8 *NextLine_(ConsoleHandle console) {
*GetTextPtr_(console, console->printTop, console->printXPos) = '\0';
console->printXPos = 0;
console->printTop++;
if (console->printTop == console->height && (console->attr & 2) == 0) {
console->printTop = 0;
}
if (console->printTop == console->ringTop) {
console->ringTopLineCnt++;
if (++console->ringTop == console->height) {
console->ringTop = 0;
}
}
return GetTextPtr_(console, console->printTop, 0);
}
static void PrintToBuffer_(ConsoleHandle console, const u8 *str) {
BOOL enabled = OSDisableInterrupts();
u8 *storePtr = GetTextPtr_(console, console->printTop, console->printXPos);
while (*str != '\0') {
if ((console->attr & 2) && console->printTop == console->height) {
break;
}
while (*str != '\0') {
bool newLineFlag = false;
if (*str == '\n') {
str++;
storePtr = NextLine_(console);
break;
} else if (*str == '\t') {
str++;
storePtr = PutTab_(console, storePtr);
} else {
u32 bytes = PutChar_(console, str, storePtr);
if (bytes > 0) {
str += bytes;
storePtr += bytes;
} else {
newLineFlag = true;
}
}
if (console->printXPos >= console->width) {
newLineFlag = true;
}
if (newLineFlag) {
if ((console->attr & 1) != 0) {
str = SearchEndOfLine_(str);
} else {
if (*str == '\n') {
str++;
}
storePtr = NextLine_(console);
}
break;
}
if (*str == '\0') {
TerminateLine_(console);
}
}
}
OSRestoreInterrupts(enabled);
}
static void Console_PrintString_(ConsoleOutputType type, ConsoleHandle console, const u8 *str) {
if ((type & CONSOLE_OUTPUT_TERMINAL) != 0) {
OSReport("%s", str);
}
if ((type & CONSOLE_OUTPUT_DISPLAY) != 0) {
PrintToBuffer_(console, str);
}
}
void Console_VFPrintf(ConsoleOutputType type, ConsoleHandle console, const char *format, va_list vlist) {
if (TryLockMutex_(&sMutex)) {
vsnprintf((char *)buf, sizeof(buf), format, vlist);
Console_PrintString_(type, console, buf);
UnlockMutex_(&sMutex);
}
}
void Console_Printf(ConsoleHandle console, const char *format, ...) {
va_list args;
va_start(args, format);
if (TryLockMutex_(&sMutex)) {
vsnprintf((char *)buf, sizeof(buf), format, args);
OSReport("%s", buf);
PrintToBuffer_(console, buf);
UnlockMutex_(&sMutex);
}
}
s32 Console_GetTotalLines(ConsoleHandle console) {
s32 count;
BOOL enabled = OSDisableInterrupts();
count = console->ringTopLineCnt + GetActiveLines_(console);
OSRestoreInterrupts(enabled);
return count;
}
} // namespace db
} // namespace nw4r
+498
View File
@@ -0,0 +1,498 @@
#include <MSL_C/string.h>
#include <nw4r/db/db_directPrint.h>
#include <nw4r/db/db_exception.h>
#include <nw4r/db/db_mapFile.h>
#include <rvl/GX.h>
#include <rvl/VI.h>
namespace nw4r {
namespace db {
struct ExceptionStruct {
OSThread thread;
OSMessageQueue queue;
void *frameMemory;
u32 stackAddress;
ConsoleHandle consoleHandle;
const GXRenderModeObj *exceptionRenderObj;
bool (*exceptionCallback)(detail::ConsoleHead *, void *);
void *exceptionCallbackArgs;
u32 MSR_COPY;
u32 FPCSR_COPY;
u16 exceptionDisplayInfo;
};
static OSMessage sMessageBuffer[1];
static struct ExceptionStruct sException;
static u8 sThreadBuffer[0x4000] ALIGN(0x20);
extern "C" u32 lbl_80574960;
const char *CPU_EXP_NAME[] = {
"SYSTEM RESET",
"MACHINE CHECK",
"DSI",
"ISI",
"EXTERNAL INTERRUPT",
"ALIGNMENT",
"PROGRAM",
"FLOATING POINT",
"DECREMENTER",
"SYSTEM CALL",
"TRACE",
"PERFORMACE MONITOR",
"BREAK POINT",
"SYSTEM INTERRUPT",
"THERMAL INTERRUPT",
"PROTECTION",
"FLOATING POINT",
};
void *RunThread_(void *);
// TODO u8 vs u16
void ErrorHandler_(u16, OSContext *, u32, u32);
void Exception_Init() {
memset(&sException, 0, sizeof(struct ExceptionStruct));
sException.exceptionCallback = nullptr;
sException.consoleHandle = nullptr;
sException.exceptionDisplayInfo = 0x21;
sException.frameMemory = nullptr;
sException.exceptionRenderObj = nullptr;
OSCreateThread(&sException.thread, RunThread_, nullptr, sThreadBuffer + 0x4000, 0x4000, 0, 1);
OSInitMessageQueue(&sException.queue, sMessageBuffer, 1);
OSResumeThread(&sException.thread);
OSSetErrorHandler(2, ErrorHandler_);
OSSetErrorHandler(3, ErrorHandler_);
OSSetErrorHandler(5, ErrorHandler_);
OSSetErrorHandler(15, ErrorHandler_);
lbl_80574960 = 0;
OSSetErrorHandler(16, nullptr);
}
extern "C" u32 PPCMfmsr();
extern "C" void PPCMtmsr(u32);
extern "C" void OSFillFPUContext(OSContext *ctx);
extern "C" void fn_803AA2E0(u32, u32, u32, u32);
static void DumpException_(const ExceptionCallbackParam *);
void ErrorHandler_(u16 error, OSContext *ctx, u32 dsisr, u32 dar) {
sException.MSR_COPY = PPCMfmsr();
sException.FPCSR_COPY = ctx->fpscr;
OSFillFPUContext(ctx);
OSSetErrorHandler(error, nullptr);
if (error == 0xf) {
fn_803AA2E0(0, 0, 0, 3);
fn_803AA2E0(1, 0, 0, 3);
fn_803AA2E0(2, 0, 0, 3);
fn_803AA2E0(3, 0, 0, 3);
}
ExceptionCallbackParam param;
param.error = error;
param.ctx = ctx;
param.dsisr = dsisr;
param.dar = dar;
OSSendMessage(&sException.queue, &param, 1);
if (OSGetCurrentThread() == nullptr) {
VISetPreRetraceCallback(nullptr);
VISetPostRetraceCallback(nullptr);
PPCMtmsr(PPCMfmsr() | 2);
DumpException_(&param);
}
while (OSEnableScheduler() > 0) {}
OSYieldThread();
OSDisableScheduler();
}
void *RunThread_(void *) {
OSMessage message;
u32 msr = PPCMfmsr();
PPCMtmsr(msr & ~(0x800 | 0x100));
OSReceiveMessage(&sException.queue, &message, 1);
OSDisableInterrupts();
VISetPreRetraceCallback(nullptr);
VISetPostRetraceCallback(nullptr);
if (sException.consoleHandle != nullptr) {
VISetBlack(false);
VIFlush();
}
DumpException_((const ExceptionCallbackParam *)message);
return nullptr;
}
static void PrintContext_(u16, const OSContext *, u32, u32);
static void WaitTime_(s32 time);
static void Console_SetVisible(ConsoleHandle, bool);
static void Console_SetViewBaseLine(ConsoleHandle, s32);
static u32 Console_GetBufferHeadLine(ConsoleHandle);
static void DrawConsoleEndless_(ConsoleHandle console) {
s32 lineCnt = Console_GetBufferHeadLine(console);
while (true) {
if (lineCnt >= Console_GetTotalLines(console)) {
lineCnt = console->ringTopLineCnt;
}
Console_SetViewBaseLine(sException.consoleHandle, lineCnt);
Console_DrawDirect(console);
WaitTime_(200);
lineCnt++;
}
}
static void DumpException_(const ExceptionCallbackParam *param) {
u16 error = param->error;
OSContext *ctx = param->ctx;
u32 dsisr = param->dsisr;
u32 dar = param->dar;
if (error < 0x11) {
sException.stackAddress = ctx->gprs[1];
}
if (sException.consoleHandle != nullptr) {
sException.frameMemory = detail::DirectPrint_SetupFB(sException.exceptionRenderObj);
}
while (true) {
PrintContext_(error, ctx, dsisr, dar);
if (sException.consoleHandle != nullptr && DirectPrint_IsActive()) {
Console_DrawDirect(sException.consoleHandle);
}
if (sException.exceptionCallback != nullptr) {
u16 info = sException.exceptionDisplayInfo;
do {
if (!(sException.exceptionCallback)(sException.consoleHandle, sException.exceptionCallbackArgs)) {
return;
}
} while (info == sException.exceptionDisplayInfo);
} else if (sException.consoleHandle != nullptr) {
DrawConsoleEndless_(sException.consoleHandle);
} else {
break;
}
}
}
static void Exception_Printf_(const char *format, ...) {
const GXRenderModeObj *obj = sException.exceptionRenderObj;
va_list args;
va_start(args, fmt);
OSVReport(format, args);
va_end(args);
if (sException.consoleHandle != nullptr) {
void *frameBuf = VIGetCurrentFrameBuffer();
DirectPrint_ChangeXfb(frameBuf, obj->fbWidth, obj->xfbHeight);
va_list args;
va_start(args, fmt);
Console_VFPrintf(CONSOLE_OUTPUT_DISPLAY, sException.consoleHandle, format, args);
va_end(args);
}
}
static void ShowStackTrace_(u32);
static void ShowMainInfo_(u16, const OSContext *, u32, u32);
static void ShowGPR_(const OSContext *);
static void ShowSRR0Map_(const OSContext *);
static void ShowGPRMap_(const OSContext *);
static void ShowFloat_(const OSContext *);
static bool ShowMapInfoSubroutine_(u32 address, bool arg);
static void PrintContext_(u16 error, const OSContext *context, u32 dsisr, u32 dar) {
if (error < 0x11) {
Exception_Printf_("******** EXCEPTION OCCURRED! ********\nFrameMemory:%XH\n", sException.frameMemory);
} else {
Exception_Printf_("******** USER HALT ********\nFrameMemory:%XH\n", sException.frameMemory);
}
if (sException.exceptionDisplayInfo & 0x1) {
Exception_Printf_("---MainInfo---\n");
ShowMainInfo_(error, context, dsisr, dar);
}
if (sException.exceptionDisplayInfo & 0x2) {
Exception_Printf_("---EXCEPTION_INFO_GPR---\n");
ShowGPR_(context);
}
if (sException.exceptionDisplayInfo & 0x8) {
Exception_Printf_("---EXCEPTION_INFO_SRR0MAP---\n");
ShowSRR0Map_(context);
}
if (sException.exceptionDisplayInfo & 0x4) {
Exception_Printf_("---EXCEPTION_INFO_GPRMAP---\n");
ShowGPRMap_(context);
}
if (sException.exceptionDisplayInfo & 0x10) {
Exception_Printf_("---EXCEPTION_INFO_FPR---\n");
ShowFloat_(context);
Exception_Printf_(" MSR:%08XH FPSCR:%08XH\n", sException.MSR_COPY, sException.FPCSR_COPY);
}
if (sException.exceptionDisplayInfo & 0x20) {
Exception_Printf_("---EXCEPTION_INFO_TRACE---\n");
ShowStackTrace_(sException.stackAddress);
}
Exception_Printf_("--------------------------------\n");
}
static bool IsValidStackAddr_(u32 stackAddress) {
if (stackAddress == 0 || stackAddress == 0xFFFFFFFF) {
return false;
} else if (OS_MEM_IS_MEM1(stackAddress)) {
if ((stackAddress & 0x0fffffff) >= OSGetPhysicalMem1Size()) {
return false;
}
} else if (OS_MEM_IS_MEM2(stackAddress)) {
if ((stackAddress & 0x0fffffff) >= OSGetPhysicalMem2Size()) {
return false;
}
} else {
return false;
}
return true;
}
static void ShowStackTrace_(u32 stackAddress) {
Exception_Printf_("-------------------------------- TRACE\n");
Exception_Printf_("Stack Address: %08X\n", stackAddress);
Exception_Printf_("LR save\n");
u32 i;
u32 *ptr = (u32 *)stackAddress;
for (i = 0; i < 16; i++) {
if (!IsValidStackAddr_((u32)ptr)) {
break;
}
Exception_Printf_("%08X ", ptr[1]);
u32 fp = ptr[1];
// TODO arg
if (!ShowMapInfoSubroutine_(fp, true)) {
Exception_Printf_("\n");
}
ptr = (u32 *)*ptr;
}
}
void ShowMainInfo_(u16 error, const OSContext *context, u32 dsisr, u32 dar) {
if (error < 0x11) {
Exception_Printf_("CONTEXT:%08XH (%s EXCEPTION)\n", context, CPU_EXP_NAME[error]);
} else {
Exception_Printf_("CONTEXT:%08XH\n", context);
}
/* floating point error */
if (error == 0x10) {
u32 uVar1 = sException.FPCSR_COPY;
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
if ((uVar1 & 0x20000000) != 0) {
Exception_Printf_(" FPE: Invalid operation\n");
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
Exception_Printf_(" SNaN\n");
}
if ((sException.FPCSR_COPY & 0x800000) != 0) {
Exception_Printf_(" Infinity - Infinity\n");
}
if ((sException.FPCSR_COPY & 0x400000) != 0) {
Exception_Printf_(" Infinity / Infinity\n");
}
if ((sException.FPCSR_COPY & 0x200000) != 0) {
Exception_Printf_(" 0 / 0\n");
}
if ((sException.FPCSR_COPY & 0x100000) != 0) {
Exception_Printf_(" Infinity * 0\n");
}
if ((sException.FPCSR_COPY & 0x80000) != 0) {
Exception_Printf_(" Invalid compare\n");
}
if ((sException.FPCSR_COPY & 0x400) != 0) {
Exception_Printf_(" Software request\n");
}
if ((sException.FPCSR_COPY & 0x200) != 0) {
Exception_Printf_(" Invalid square root\n");
}
if ((sException.FPCSR_COPY & 0x100) != 0) {
Exception_Printf_(" Invalid integer convert\n");
}
}
if ((uVar1 & 0x10000000) != 0) {
Exception_Printf_(" FPE: Overflow\n");
}
if ((uVar1 & 0x8000000) != 0) {
Exception_Printf_(" FPE: Underflow\n");
}
if ((uVar1 & 0x4000000) != 0) {
Exception_Printf_(" FPE: Zero division\n");
}
if ((uVar1 & 0x2000000) != 0) {
Exception_Printf_(" FPE: Inexact result\n");
}
}
Exception_Printf_("SRR0: %08XH SRR1:%08XH\n", context->srr0, context->srr1);
Exception_Printf_("DSISR: %08XH DAR: %08XH\n", dsisr, dar);
}
void ShowGPR_(const OSContext *ctx) {
Exception_Printf_("-------------------------------- GPR\n");
for (int i = 0; i < 10; i++) {
Exception_Printf_("R%02d:%08XH R%02d:%08XH R%02d:%08XH\n", i, ctx->gprs[i], i + 11, ctx->gprs[i + 11], i + 22,
ctx->gprs[i + 22]);
}
Exception_Printf_("R%02d:%08XH R%02d:%08XH\n", 10, ctx->gprs[10], 21, ctx->gprs[21]);
}
void ShowGPRMap_(const OSContext *ctx) {
bool shownAny = false;
Exception_Printf_("-------------------------------- GPRMAP\n");
for (int i = 0; i <= 31; i++) {
u32 address = ctx->gprs[i];
if ((address < 0x80000000) || (0x82ffffff < address)) {
continue;
}
shownAny = true;
Exception_Printf_("R%02d: %08XH ", i, address);
// TODO arg
if (!ShowMapInfoSubroutine_(address, true)) {
Exception_Printf_(" no information\n");
}
}
if (!shownAny) {
Exception_Printf_(" no register which seem to address.\n");
}
}
void ShowSRR0Map_(const OSContext *ctx) {
Exception_Printf_("-------------------------------- SRR0MAP\n");
u32 address = ctx->srr0;
if (!((address < 0x80000000) || (0x82ffffff < address))) {
Exception_Printf_("SRR0: %08XH ", address);
// TODO arg
if (!ShowMapInfoSubroutine_(address, true)) {
Exception_Printf_(" no information\n");
}
}
}
// 804ca0e4
extern "C" int __fpclassifyf(float val);
static void ShowFloatSub_(s32 reg, f32 val);
void ShowFloat_(const OSContext *ctx) {
Exception_Printf_("-------------------------------- FPR\n");
for (int i = 0; i < 10; i++) {
ShowFloatSub_(i, ctx->fprs[i]);
Exception_Printf_(" ");
ShowFloatSub_(i + 11, ctx->fprs[i + 11]);
Exception_Printf_(" ");
ShowFloatSub_(i + 22, ctx->fprs[i + 22]);
Exception_Printf_("\n");
}
ShowFloatSub_(10, ctx->fprs[10]);
Exception_Printf_(" ");
ShowFloatSub_(21, ctx->fprs[21]);
Exception_Printf_("\n");
}
void ShowFloatSub_(s32 reg, f32 val) {
if (__fpclassifyf(val) == 1) {
Exception_Printf_("F%02d: Nan ", reg);
} else {
if (__fpclassifyf(val) == 2) {
if ((reinterpret_cast<u8 &>(val) & 0x80) != 0) {
Exception_Printf_("F%02d:+Inf ", reg);
} else {
Exception_Printf_("F%02d:-Inf ", reg);
}
} else if (val == 0.0f) {
Exception_Printf_("F%02d: 0.0 ", reg);
} else {
Exception_Printf_("F%02d:%+.3E", reg, val);
}
}
}
static void SetFPException_(u32) {
// TODO
}
bool ShowMapInfoSubroutine_(u32 address, bool arg) {
if ((address < 0x80000000) || (0x82ffffff < address)) {
return false;
} else {
u8 acStack_124[260];
if (nw4r::db::MapFile_QuerySymbol(address, acStack_124, sizeof(acStack_124))) {
Exception_Printf_("%s\n", acStack_124);
return true;
} else {
return false;
}
}
}
ConsoleHandle Exception_SetConsole(ConsoleHandle console, const GXRenderModeObj *renderObj) {
ConsoleHandle old = sException.consoleHandle;
sException.exceptionRenderObj = renderObj;
sException.consoleHandle = console;
return old;
}
ConsoleHandle Exception_GetConsole() {
return sException.consoleHandle;
}
void Exception_SetUserCallback(bool (*callback)(detail::ConsoleHead *, void *), void *args) {
sException.exceptionCallback = callback;
sException.exceptionCallbackArgs = args;
}
u16 Exception_SetDisplayInfo(u16 newInfo) {
u16 old = sException.exceptionDisplayInfo;
sException.exceptionDisplayInfo = newInfo;
return old;
}
static void WaitTime_(s32 time) {
s64 t1 = OSGetTime();
s64 t2;
do {
t2 = OSGetTime();
} while ((t2 - t1) / ((OS_BUS_CLOCK_SPEED / 4) / 1000) < time);
}
/*
void DrawConsoleEndless_(detail::ConsoleHead *) {
// TODO
}
*/
static void Console_SetVisible(detail::ConsoleHead *, bool) {
// TODO
}
static void Console_SetViewBaseLine(detail::ConsoleHead *console, s32 line) {
console->viewTopLine = line;
}
static u32 Console_GetBufferHeadLine(detail::ConsoleHead *console) {
return console->ringTopLineCnt;
}
} // namespace db
} // namespace nw4r
+2 -2
View File
@@ -17,7 +17,7 @@ static s32 sMapBufMaxSize = 0x200;
static u8 *sMapBuf = dvdReadBuf;
static s32 sMapBufOffset = -1;
static void MapFile_Append(MapFile *file) {
static void MapFile_Append_(MapFile *file) {
if (sMapFileList == nullptr) {
sMapFileList = file;
return;
@@ -40,7 +40,7 @@ MapFileHandle MapFile_RegistOnDvd(void *buf, const char *path, const OSModuleInf
file->fileEntry = DVDConvertPathToEntrynum(path);
file->next = nullptr;
MapFile_Append(file);
MapFile_Append_(file);
return file;
}