mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-06 19:41:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some OOT transfers, some renaming, etc (#75)

Browse Source 
* Progress on various files

* gfxprint stuff

* split some rodata, add iconv for rodata string parsing

* z_std_dma rodata

* 2 nonmatchings in gfxprint

* mtxuty-cvt ok

* more

* match a function in idle.c

* progress

* Cleanup

* Rename BgPolygon to CollisionPoly

* progress

* some effect stuff

* more effect progress

* updates

* made suggested changes

* z_effect_soft_sprite_old_init mostly ok

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
This commit is contained in:
Lucas Shaw
2021-03-27 14:17:41 -07:00
committed by GitHub
parent fee7a49abc
commit 623b6d5318
84 changed files with 4327 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot_O2_g3_trapuv/fault.c
+148 -178
View File
@@ -2,51 +2,45 @@
#include <global.h>
// TODO move out
#define OS_CLOCK_RATE 62500000LL
#define OS_CPU_COUNTER (OS_CLOCK_RATE*3/4)
#define OS_USEC_TO_CYCLES(n) (((u64)(n)*(OS_CPU_COUNTER/15625LL))/(1000000LL/15625LL))
#define OS_CLOCK_RATE 62500000LL
void Fault_SleepImpl(u32 duration) {
u64 value = (duration * OS_CPU_COUNTER) / 1000ull;
wait_cycles(value);
Sleep_Cycles(value);
}
#ifdef NON_MATCHING
// minor reordering around the start of the loop, same as Fault_AddAddrConvClient
void Fault_AddClient(FaultClient* client, fault_client_func callback, void* param0, void* param1) {
OSIntMask mask;
u32 alreadyExist;
FaultClient* iter;
alreadyExist = 0;
u32 alreadyExists = 0;
mask = osSetIntMask(1);
iter = faultCtxt->clients;
while (iter) {
if (iter == client) {
alreadyExist = 1;
goto end;
{
FaultClient* iter = sFaultContext->clients;
while (iter) {
if (iter == client) {
alreadyExists = 1;
goto end;
}
iter = iter->next;
}
iter = iter->next;
}
client->callback = callback;
client->param0 = param0;
client->param1 = param1;
client->next = faultCtxt->clients;
faultCtxt->clients = client;
client->next = sFaultContext->clients;
sFaultContext->clients = client;
end:
osSetIntMask(mask);
if (alreadyExist) {
if (alreadyExists) {
Fault_Log(D_800984B4, client);
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_AddClient.asm")
#endif
void Fault_RemoveClient(FaultClient* client) {
FaultClient* iter;
@@ -54,7 +48,7 @@ void Fault_RemoveClient(FaultClient* client) {
OSIntMask mask;
u32 listIsEmpty;
iter = faultCtxt->clients;
iter = sFaultContext->clients;
listIsEmpty = 0;
lastIter = NULL;
@@ -65,9 +59,9 @@ void Fault_RemoveClient(FaultClient* client) {
if (lastIter) {
lastIter->next = client->next;
} else {
faultCtxt->clients = client;
if (faultCtxt->clients) {
faultCtxt->clients = client->next;
sFaultContext->clients = client;
if (sFaultContext->clients) {
sFaultContext->clients = client->next;
} else {
listIsEmpty = 1;
}
@@ -86,41 +80,35 @@ void Fault_RemoveClient(FaultClient* client) {
}
}
#ifdef NON_MATCHING
// minor reordering around the start of the loop, same as Fault_AddClient
void Fault_AddAddrConvClient(FaultAddrConvClient* client, fault_address_converter_func callback, void* param) {
OSIntMask mask;
u32 alreadyExist;
FaultAddrConvClient* iter;
alreadyExist = 0;
u32 alreadyExists = 0;
mask = osSetIntMask(1);
iter = faultCtxt->addrConvClients;
while (iter) {
if (iter == client) {
alreadyExist = 1;
goto end;
}
iter = iter->next;
}
{
FaultAddrConvClient* iter = sFaultContext->addrConvClients;
while (iter) {
if (iter == client) {
alreadyExists = 1;
goto end;
}
iter = iter->next;
}
}
client->callback = callback;
client->param = param;
client->next = faultCtxt->addrConvClients;
faultCtxt->addrConvClients = client;
client->next = sFaultContext->addrConvClients;
sFaultContext->addrConvClients = client;
end:
osSetIntMask(mask);
if (alreadyExist) {
if (alreadyExists) {
Fault_Log(D_80098524, client);
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_AddAddrConvClient.asm")
#endif
void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
FaultAddrConvClient* iter;
@@ -128,7 +116,7 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
OSIntMask mask;
u32 listIsEmpty;
iter = faultCtxt->addrConvClients;
iter = sFaultContext->addrConvClients;
listIsEmpty = 0;
lastIter = NULL;
@@ -139,9 +127,9 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
if (lastIter) {
lastIter->next = client->next;
} else {
faultCtxt->addrConvClients = client;
if (faultCtxt->addrConvClients) {
faultCtxt->addrConvClients = client->next;
sFaultContext->addrConvClients = client;
if (sFaultContext->addrConvClients) {
sFaultContext->addrConvClients = client->next;
} else {
listIsEmpty = 1;
}
@@ -162,9 +150,9 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
void* Fault_ConvertAddress(void* addr) {
void* ret;
FaultAddrConvClient* iter = faultCtxt->addrConvClients;
FaultAddrConvClient* iter = sFaultContext->addrConvClients;
while(iter) {
while (iter) {
if (iter->callback) {
ret = iter->callback(addr, iter->param);
if (ret != NULL) {
@@ -186,55 +174,47 @@ void Fault_PadCallback(Input* input) {
}
void Fault_UpdatePadImpl() {
faultCtxt->padCallback(faultCtxt->padInput);
sFaultContext->padCallback(sFaultContext->padInput);
}
#ifdef NON_MATCHING
// curInput is being put in s3 instead of temp registers
// Stack is too small
s32 Fault_WaitForInputImpl() {
Input* curInput;
u32 Fault_WaitForInputImpl() {
Input* curInput = &sFaultContext->padInput[0];
s32 count = 600;
u32 kDown;
s32 count;
count = 600;
curInput = faultCtxt->padInput;
while (1) {
while (1) {
Fault_Sleep(0x10);
Fault_UpdatePadImpl();
kDown = curInput->press.button;
if (kDown == BTN_L) {
faultCtxt->faultActive = !faultCtxt->faultActive;
}
Fault_Sleep(0x10);
Fault_UpdatePadImpl();
if (!faultCtxt->faultActive) {
break;
}
kDown = curInput->press.button;
if (kDown == BTN_L) {
sFaultContext->faultActive = !sFaultContext->faultActive;
}
if (sFaultContext->faultActive) {
if (count-- < 1) {
return 0;
}
}
} else {
if (kDown == BTN_A || kDown == BTN_DRIGHT) {
return 0;
}
if (kDown == BTN_A || kDown == BTN_DRIGHT) {
return 0;
}
if (kDown == BTN_DLEFT) {
return 1;
}
if (kDown == BTN_DUP) {
FaultDrawer_SetOsSyncPrintfEnabled(1);
}
if (kDown == BTN_DDOWN) {
FaultDrawer_SetOsSyncPrintfEnabled(0);
if (kDown == BTN_DLEFT) {
return 1;
}
if (kDown == BTN_DUP) {
FaultDrawer_SetOsSyncPrintfEnabled(1);
}
if (kDown == BTN_DDOWN) {
FaultDrawer_SetOsSyncPrintfEnabled(0);
}
}
}
return 0;
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_WaitForInputImpl.asm")
#endif
void Fault_WaitForInput() {
Fault_WaitForInputImpl();
@@ -273,32 +253,25 @@ void Fault_PrintFReg(s32 idx, f32* value) {
}
}
#ifdef NON_MATCHING
// regalloc
void Fault_LogFReg(s32 idx, f32* value) {
s32 v0;
u32 raw;
u32 raw = *(u32*)value;
s32 v0 = ((raw & 0x7F800000) >> 0x17) - 0x7F;
raw = *(u32*)value;
v0 = ((*(u32*)value & 0x7f800000) >> 0x17) - 0x7f;
if ((v0 >= -0x7e && v0 < 0x80) || *(u32*)value == 0) {
if ((v0 >= -0x7E && v0 < 0x80) || raw == 0) {
Fault_Log(D_800985DC, idx, *value);
} else {
Fault_Log(D_800985EC, idx, raw);
Fault_Log(D_800985EC, idx, *(u32*)value);
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_LogFReg.asm")
#endif
void Fault_PrintFPCR(u32 value) {
s32 i;
u32 flag = 0x20000;
FaultDrawer_Printf(D_80098600, value);
for (i = 0; i < 6; i++) {
for (i = 0; i < ARRAY_COUNT(sExceptionNames); i++) {
if (value & flag) {
FaultDrawer_Printf(D_80098610, D_80096BC8[i]);
FaultDrawer_Printf(D_80098610, sExceptionNames[i]);
break;
}
flag >>= 1;
@@ -309,23 +282,26 @@ void Fault_PrintFPCR(u32 value) {
void Fault_LogFPCR(u32 value) {
s32 i;
u32 flag = 0x20000;
Fault_Log(D_8009861C, value);
for (i = 0; i < 6; i++) {
for (i = 0; i < ARRAY_COUNT(sExceptionNames); i++) {
if (value & flag) {
Fault_Log(D_8009862C, D_80096BC8[i]);
Fault_Log(D_8009862C, sExceptionNames[i]);
break;
}
flag >>= 1;
}
}
void Fault_PrintThreadContext(OSThread* t){
void Fault_PrintThreadContext(OSThread* t) {
__OSThreadContext* ctx;
s32 causeStrIdx = (s32) ((((u32) t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10;
if (causeStrIdx == 0x17)
s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10;
if (causeStrIdx == 0x17) {
causeStrIdx = 0x10;
if (causeStrIdx == 0x1F)
}
if (causeStrIdx == 0x1F) {
causeStrIdx = 0x11;
}
FaultDrawer_FillScreen();
FaultDrawer_SetCharPad(-2, 4);
@@ -380,13 +356,15 @@ void Fault_PrintThreadContext(OSThread* t){
}
}
void Fault_LogThreadContext(OSThread* t){
__OSThreadContext *ctx;
s32 causeStrIdx = (s32) ((((u32) t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10;
if (causeStrIdx == 0x17)
void Fault_LogThreadContext(OSThread* t) {
__OSThreadContext* ctx;
s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10;
if (causeStrIdx == 0x17) {
causeStrIdx = 0x10;
if (causeStrIdx == 0x1f)
}
if (causeStrIdx == 0x1f) {
causeStrIdx = 0x11;
}
ctx = &t->context;
Fault_Log(D_800987B0);
@@ -434,8 +412,7 @@ void Fault_LogThreadContext(OSThread* t){
OSThread* Fault_FindFaultedThread() {
OSThread* iter = __osGetActiveQueue();
while (iter->priority != -1)
{
while (iter->priority != -1) {
if (iter->priority > 0 && iter->priority < 0x7f && (iter->flags & 3)) {
return iter;
}
@@ -451,11 +428,11 @@ void Fault_Wait5Seconds(void) {
Fault_Sleep(0x10);
} while ((osGetTime() - start) <= OS_USEC_TO_CYCLES(5000000));
faultCtxt->faultActive = 1;
sFaultContext->faultActive = 1;
}
void Fault_WaitForButtonCombo(void) {
Input* input = &faultCtxt->padInput[0];
Input* input = &sFaultContext->padInput[0];
FaultDrawer_SetForeColor(0xffff);
FaultDrawer_SetBackColor(1);
@@ -487,7 +464,7 @@ void Fault_DrawMemDumpPage(char* title, u32* addr, u32 param_3) {
Fault_FillScreenBlack();
FaultDrawer_SetCharPad(-2, 0);
FaultDrawer_DrawText(0x24, 0x12, D_80098954, title? title : D_8009895C, alignedAddr);
FaultDrawer_DrawText(0x24, 0x12, D_80098954, title ? title : D_8009895C, alignedAddr);
if (alignedAddr >= (u32*)0x80000000 && alignedAddr < (u32*)0xC0000000) {
for (y = 0x1C; y != 0xE2; y += 9) {
FaultDrawer_DrawText(0x18, y, D_80098968, writeAddr);
@@ -500,15 +477,14 @@ void Fault_DrawMemDumpPage(char* title, u32* addr, u32 param_3) {
FaultDrawer_SetCharPad(0, 0);
}
#ifdef NON_MATCHING
// The count = 600 load happens a bit too early
void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
s32 count;
s32 off;
Input* input = &faultCtxt->padInput[0];
Input* input = &sFaultContext->padInput[0];
u32 addr = pc;
do {
count = 0;
if (addr < 0x80000000) {
addr = 0x80000000;
}
@@ -520,7 +496,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
Fault_DrawMemDumpPage(D_80098978, (u32*)addr, 0);
count = 600;
while (faultCtxt->faultActive) {
while (sFaultContext->faultActive) {
if (count == 0) {
return;
}
@@ -531,7 +507,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
Fault_UpdatePadImpl();
if (CHECK_BTN_ALL(input->press.button, BTN_L)) {
faultCtxt->faultActive = 0;
sFaultContext->faultActive = 0;
}
}
do {
@@ -539,15 +515,15 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
Fault_UpdatePadImpl();
} while (input->press.button == 0);
if (CHECK_BTN_ALL(input->press.button, BTN_START)) == 0) {
if (CHECK_BTN_ALL(input->press.button, BTN_START)) {
return;
}
off = 0x10;
if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
if (CHECK_BTN_ALL(input->cur.button, BTN_A)) {
off = 0x100;
}
if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
if (CHECK_BTN_ALL(input->cur.button, BTN_B)) {
off <<= 8;
}
if (CHECK_BTN_ALL(input->press.button, BTN_DUP)) {
@@ -571,11 +547,8 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
} while (!CHECK_BTN_ALL(input->press.button, BTN_L));
faultCtxt->faultActive = 1;
sFaultContext->faultActive = 1;
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_DrawMemDump.asm")
#endif
#ifdef NON_MATCHING
// This function still needs a bit of work
@@ -655,7 +628,7 @@ void Fault_DrawStackTrace(OSThread* t, u32 flags) {
FaultDrawer_DrawText(0x24, 0x18, D_8009898C);
for (y = 1; (y < 22) && (((ra != 0) || (sp != 0)) && (pc != (u32)__osCleanupThread)); y++) {
FaultDrawer_DrawText(0x24, y*8+24, D_800989A4, sp, pc);
FaultDrawer_DrawText(0x24, y * 8 + 24, D_800989A4, sp, pc);
if (flags & 1) {
convertedPc = (u32)Fault_ConvertAddress((void*)pc);
@@ -711,17 +684,15 @@ void Fault_ResumeThread(OSThread* t) {
osStartThread(t);
}
#ifdef NON_MATCHING
// regalloc
void Fault_CommitFB() {
u16* fb;
osViSetYScale(1.0f);
osViSetMode(&osViModeNtscLan1);
osViSetSpecialFeatures(0x42); //gama_disable|dither_fliter_enable_aa_mode3_disable
osViSetSpecialFeatures(0x42); // gama_disable|dither_fliter_enable_aa_mode3_disable
osViBlack(0);
if (faultCtxt->fb) {
fb = faultCtxt->fb;
if (sFaultContext->fb) {
fb = sFaultContext->fb;
} else {
fb = (u16*)osViGetNextFramebuffer();
if ((u32)fb == 0x80000000) {
@@ -730,16 +701,14 @@ void Fault_CommitFB() {
}
osViSwapBuffer(fb);
FaultDrawer_SetDrawerFB(fb, 0x140, 0xF0);
FaultDrawer_SetDrawerFB(fb, SCREEN_WIDTH, SCREEN_HEIGHT);
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_CommitFB.asm")
#endif
void Fault_ProcessClients(void) {
FaultClient* iter = faultCtxt->clients;
FaultClient* iter = sFaultContext->clients;
s32 idx = 0;
while(iter) {
while (iter != NULL) {
if (iter->callback) {
Fault_FillScreenBlack();
FaultDrawer_SetCharPad(-2, 0);
@@ -762,7 +731,7 @@ void Fault_SetOptionsFromController3(void) {
u32 graphRA;
u32 graphSP;
input3 = &faultCtxt->padInput[3];
input3 = &sFaultContext->padInput[3];
if (CHECK_BTN_ALL(input3->press.button, 0x80)) {
faultCustomOptions = faultCustomOptions == 0;
@@ -801,52 +770,51 @@ void Fault_ThreadEntry(void* arg) {
u32 pad;
OSThread* faultedThread;
osSetEventMesg(10, &faultCtxt->queue, (OSMesg)1);
osSetEventMesg(12, &faultCtxt->queue, (OSMesg)2);
osSetEventMesg(10, &sFaultContext->queue, (OSMesg)1);
osSetEventMesg(12, &sFaultContext->queue, (OSMesg)2);
while (1) {
do {
osRecvMesg(&faultCtxt->queue, &msg, 1);
osRecvMesg(&sFaultContext->queue, &msg, 1);
if (msg == (OSMesg)1) {
faultCtxt->msgId = 1;
sFaultContext->msgId = 1;
Fault_Log(D_80098A88);
} else if (msg == (OSMesg)2) {
faultCtxt->msgId = 2;
sFaultContext->msgId = 2;
Fault_Log(D_80098AC0);
} else if (msg == (OSMesg)3) {
Fault_SetOptions();
faultedThread = NULL;
continue;
} else {
faultCtxt->msgId = 3;
sFaultContext->msgId = 3;
Fault_Log(D_80098AF4);
}
faultedThread = __osGetCurrFaultedThread();
Fault_Log(D_80098B28, faultedThread);
if (!faultedThread)
{
if (!faultedThread) {
faultedThread = Fault_FindFaultedThread();
Fault_Log(D_80098B4C, faultedThread);
}
} while (faultedThread == NULL);
__osSetFpcCsr(__osGetFpcCsr() & 0xFFFFF07F);
faultCtxt->faultedThread = faultedThread;
while (!faultCtxt->faultHandlerEnabled) {
sFaultContext->faultedThread = faultedThread;
while (!sFaultContext->faultHandlerEnabled) {
Fault_Sleep(1000);
}
Fault_Sleep(500);
Fault_CommitFB();
if (faultCtxt->faultActive) {
if (sFaultContext->faultActive) {
Fault_Wait5Seconds();
} else {
Fault_DrawCornerRec(0xF801);
Fault_WaitForButtonCombo();
}
faultCtxt->faultActive = 1;
sFaultContext->faultActive = 1;
FaultDrawer_SetForeColor(0xFFFF);
FaultDrawer_SetBackColor(0);
@@ -869,55 +837,57 @@ void Fault_ThreadEntry(void* arg) {
FaultDrawer_DrawText(0x40, 0x6E, D_80098BBC);
Fault_WaitForInput();
} while (!faultCtxt->exitDebugger);
} while (!sFaultContext->exitDebugger);
while(!faultCtxt->exitDebugger);
while (!sFaultContext->exitDebugger) {
;
}
Fault_ResumeThread(faultedThread);
}
}
void Fault_SetFB(void* fb, u16 w, u16 h) {
faultCtxt->fb = fb;
sFaultContext->fb = fb;
FaultDrawer_SetDrawerFB(fb, w, h);
}
void Fault_Start(void){
faultCtxt = &faultContextStruct;
bzero(faultCtxt, sizeof(FaultThreadStruct));
void Fault_Start(void) {
sFaultContext = &gFaultStruct;
bzero(sFaultContext, sizeof(FaultThreadStruct));
FaultDrawer_Init();
FaultDrawer_SetInputCallback(Fault_WaitForInput);
faultCtxt->exitDebugger = 0;
faultCtxt->msgId = 0;
faultCtxt->faultHandlerEnabled = 0;
faultCtxt->faultedThread = NULL;
faultCtxt->padCallback = &Fault_PadCallback;
faultCtxt->clients = NULL;
faultCtxt->faultActive = 0;
faultContextStruct.faultHandlerEnabled = 1;
osCreateMesgQueue(&faultCtxt->queue, faultCtxt->msg, 1);
StackCheck_Init(&faultStackEntry, faultStack, &faultStack[1536], 0, 0x100, faultThreadName);
osCreateThread(&faultCtxt->thread, 2, (osCreateThread_func)Fault_ThreadEntry, 0, &faultStack[1536], 0x7f);
osStartThread(&faultCtxt->thread);
sFaultContext->exitDebugger = 0;
sFaultContext->msgId = 0;
sFaultContext->faultHandlerEnabled = 0;
sFaultContext->faultedThread = NULL;
sFaultContext->padCallback = &Fault_PadCallback;
sFaultContext->clients = NULL;
sFaultContext->faultActive = 0;
gFaultStruct.faultHandlerEnabled = 1;
osCreateMesgQueue(&sFaultContext->queue, sFaultContext->msg, 1);
StackCheck_Init(&sFaultThreadInfo, sFaultStack, sFaultStack + sizeof(sFaultStack), 0, 0x100, faultThreadName);
osCreateThread(&sFaultContext->thread, 2, Fault_ThreadEntry, NULL, sFaultStack + sizeof(sFaultStack), 0x7F);
osStartThread(&sFaultContext->thread);
}
void Fault_HangupFaultClient(char* arg0, char* arg1) {
Fault_Log(D_80098BE0, osGetThreadId(0));
void Fault_HangupFaultClient(const char* arg0, char* arg1) {
Fault_Log(D_80098BE0, osGetThreadId(NULL));
Fault_Log(D_80098BF8, arg0 ? arg0 : D_80098BFC);
Fault_Log(D_80098C04, arg1 ? arg1 : D_80098C08);
FaultDrawer_Printf(D_80098C10, osGetThreadId(0));
FaultDrawer_Printf(D_80098C10, osGetThreadId(NULL));
FaultDrawer_Printf(D_80098C28, arg0 ? arg0 : D_80098C2C);
FaultDrawer_Printf(D_80098C34, arg1 ? arg1 : D_80098C38);
}
void Fault_AddHungupAndCrashImpl(char* arg0, char* arg1) {
void Fault_AddHungupAndCrashImpl(const char* arg0, char* arg1) {
FaultClient client;
char padd[4];
Fault_AddClient(&client, (fault_client_func)Fault_HangupFaultClient, arg0, arg1);
*(u32*)0x11111111 = 0; //trigger an exception
*(u32*)0x11111111 = 0; // trigger an exception
}
void Fault_AddHungupAndCrash(char* filename, u32 line) {
void Fault_AddHungupAndCrash(const char* filename, u32 line) {
char msg[256];
sprintf(msg, D_80098C40, filename, line);
Fault_AddHungupAndCrashImpl(msg, NULL);
src/boot_O2_g3_trapuv/fault_drawer.c
+65 -29
View File
@@ -3,21 +3,36 @@
FaultDrawer* sFaultDrawContext = &sFaultDrawerStruct;
FaultDrawer sFaultDrawerDefault = {
(u16*)0x803DA800, // fb - TODO map out buffers in this region and avoid hard-coded pointer
320, 240, // w, h
16, 223, // yStart, yEnd
22, 297,// xStart, xEnd
0xFFFF, 0x0000, // foreColor, backColor
22, 16, // cursorX, cursorY
(u32*)&faultDrawFont, // font
8, 8, 0, 0, // charW, charH, charWPad, charHPad
{ // printColors
0x0001, 0xF801, 0x07C1, 0xFFC1,
0x003F, 0xF83F, 0x07FF, 0xFFFF,
0x7BDF, 0xB5AD
(u16*)0x803DA800, // fb - TODO map out buffers in this region and avoid hard-coded pointer
SCREEN_WIDTH, // w
SCREEN_HEIGHT, // h
16, // yStart
223, // yEnd
22, // xStart
297, // xEnd
GPACK_RGBA5551(255, 255, 255, 255), // foreColor
GPACK_RGBA5551(0, 0, 0, 0), // backColor
22, // cursorX
16, // cursorY
(u32*)&sFaultDrawerFont, // font
8, // charW
8, // charH
0, // charWPad
0, // charHPad
{ // printColors
GPACK_RGBA5551(0, 0, 0, 1),
GPACK_RGBA5551(255, 0, 0, 1),
GPACK_RGBA5551(0, 255, 0, 1),
GPACK_RGBA5551(255, 255, 0, 1),
GPACK_RGBA5551(0, 0, 255, 1),
GPACK_RGBA5551(255, 0, 255, 1),
GPACK_RGBA5551(0, 255, 255, 1),
GPACK_RGBA5551(255, 255, 255, 1),
GPACK_RGBA5551(120, 120, 120, 1),
GPACK_RGBA5551(176, 176, 176, 1),
},
0, // escCode
0, // osSyncPrintfEnabled
0, // escCode
0, // osSyncPrintfEnabled
NULL, // inputCallback
};
@@ -26,31 +41,40 @@ void FaultDrawer_SetOsSyncPrintfEnabled(u32 enabled) {
}
#ifdef NON_MATCHING
//This function needs a lot of work
void FaultDrawer_DrawRecImpl(s32 xstart, s32 ystart, s32 xend, s32 yend, u16 color) {
s32 x;
s32 y;
void FaultDrawer_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color) {
u16* fb;
if (sFaultDrawContext->w - xstart > 0 && sFaultDrawContext->h - ystart > 0) {
for (y = 0; y < yend - ystart + 1; y++) {
fb = &sFaultDrawContext->fb[sFaultDrawContext->w * y];
for (x = 0; x < xend - xstart + 1; x++) {
s32 x, y;
s32 xDiff = sFaultDrawContext->w - xStart;
s32 yDiff = sFaultDrawContext->h - yStart;
s32 xSize = xEnd - xStart + 1;
s32 ySize = yEnd - yStart + 1;
if (xDiff > 0 && yDiff > 0) {
if (xDiff < xSize) {
xSize = xDiff;
}
if (yDiff < ySize) {
ySize = yDiff;
}
fb = sFaultDrawContext->fb + sFaultDrawContext->w * yStart + xStart;
for (y = 0; y < ySize; y++) {
for (x = 0; x < xSize; x++) {
*fb++ = color;
}
fb += sFaultDrawContext->w - xSize;
}
osWritebackDCacheAll();
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawRecImpl.asm")
#endif
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawChar.asm")
s32 FaultDrawer_ColorToPrintColor(u16 color) {
s32 i;
for (i = 0; i < 10; i++) {
if (color == sFaultDrawContext->printColors[i]) {
return i;
@@ -61,6 +85,7 @@ s32 FaultDrawer_ColorToPrintColor(u16 color) {
void FaultDrawer_UpdatePrintColor() {
s32 idx;
if (sFaultDrawContext->osSyncPrintfEnabled) {
Fault_Log(D_80099050);
idx = FaultDrawer_ColorToPrintColor(sFaultDrawContext->foreColor);
@@ -85,7 +110,7 @@ void FaultDrawer_SetBackColor(u16 color) {
}
void FaultDrawer_SetFontColor(u16 color) {
FaultDrawer_SetForeColor((u16)(color | 1)); //force alpha to be set
FaultDrawer_SetForeColor(color | 1); //force alpha to be set
}
void FaultDrawer_SetCharPad(s8 padW, s8 padH) {
@@ -116,9 +141,20 @@ void FaultDrawer_VPrintf(char* str, char* args) { //va_list
_Printf((printf_func)FaultDrawer_FormatStringFunc, sFaultDrawContext, str, args);
}
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_Printf.asm")
void FaultDrawer_Printf(const char* fmt, ...) {
va_list args;
va_start(args, fmt);
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawText.asm")
FaultDrawer_VPrintf(fmt, args);
}
void FaultDrawer_DrawText(s32 x, s32 y, const char* fmt, ...) {
va_list args;
va_start(args, fmt);
FaultDrawer_SetCursor(x, y);
FaultDrawer_VPrintf(fmt, args);
}
void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) {
sFaultDrawContext->fb = (u16*)fb;