mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-28 23:25:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Matched display_and_vsync in main.c began decompiling crash_screen.c (#27)

Browse Source 
* Matched display_and_vsync in main.c and began decompiling crash_screen.c
This commit is contained in:
CoderStig
2021-07-23 16:47:52 -06:00
committed by GitHub
parent 62741d98d3
commit f5b22811bb
17 changed files with 2502 additions and 2182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/crash_screen.c
+402
View File
@@ -0,0 +1,402 @@
#include <ultra64.h>
#include <macros.h>
#include "types.h"
/*void *__osGetCurrFaultedThread(); // extern
? osCreateMesgQueue(? *, ? *, ?); // extern
? osCreateThread(? *, ?, void (*)(s32 arg0), ?, ? *, s32); // extern
? osRecvMesg(? *, ? *, ?); // extern
? osSetEventMesg(?, ? *, ?); // extern
? osStartThread(? *); // extern
? osViSwapBuffer(s32); // extern
? osWritebackDCacheAll(s32, s32, s16, s16); // extern
? read_controllers(); // extern
void crash_screen_draw_info(uint_ptr arg0, void *arg1); // static
void crash_screen_draw_square(uint_ptr arg0); // static
void create_debug_thread(); // static
void func_800040C0(s32 arg0, s32 arg1, s32 arg2, u32 arg3); // static
void func_800046AC(s32 arg0); // static
void *get_faulted_thread(); // static
void start_debug_thread(); // static
void thread9_crash_screen(s32 arg0); // static
extern void *D_800DC4BC;
extern s32 D_800DC670;
extern ? D_800DC6FC;
extern ? D_80162790;
extern ? D_80162D40;
extern ? D_80162D58;
extern uintptr_t pFramebuffer;
extern s32 D_80162D60;
extern void *D_80162D64;
*/
u32 D_800DC670 = 0;
u32 crashScreenFont[34] = {
#include "textures/crash_screen/crash_screen_font.ia1.inc.c"
};
u16 D_800DC6FC[10] = {
32, 2048, 512, 1024, 256, 16, 32, 16384, 32768, 65535
// 0x0020, 0x0800, 0x0200, 0x0400, 0x0100, 0x0010, 0x0020, 0x4000, 0x8000, 0xffff
};
/*
// similar to sm64's crash_screen_draw_glyph
void func_800040C0(uintptr_t framebuffer, s32 x, s32 y, u32 glyph) {
s32 temp_v0;
u32 *data;
u16 *ptr;
s32 temp_a0;
s32 phi_v1;
s32 phi_v0;
s32 phi_a0;
//phi_v0 = frameBuffer;
//temp_v0 = glyph * 7;
ptr = framebuffer; //+ y * 320 + x;
data = crashScreenFont[glyph * 8];
temp_v0 = 0;
while(temp_v0 != 8) {
phi_v1 = (s32)*data;
phi_a0 = 5;
for (temp_a0 = 0; temp_a0 >= 0; temp_a0++) {
if (phi_v1 & 1) {
framebuffer += ((((y +phi_v0) * 320) + x + phi_a0) * 2);
}
//ptr++;
phi_a0--;
*data += *data >> 1;
//phi_a0 = temp_a0;
}
//phi_v0++;
//phi_v0 = temp_v0;
data += 1;
}
}
*/
/*
void func_800040C0(s32 x, s32 y, s32 w, s32 h) {
u16 *ptr;
s32 i, j;
ptr = gCrashScreen.framebuffer + gCrashScreen.width * y + x;
for (i = 0; i < h; i++) {
for (j = 0; j < w; j++) {
// 0xe738 = 0b1110011100111000
*ptr = ((*ptr & 0xe738) >> 2) | 1;
ptr++;
}
ptr += gCrashScreen.width - w;
}
}
*/
GLOBAL_ASM("asm/non_matchings/crash_screen/func_800040C0.s")
GLOBAL_ASM("asm/non_matchings/crash_screen/crash_screen.s")
/*
void crash_screen_draw_square(uint_ptr arg0, s32 arg1) {
s32 temp_a0;
s32 temp_a1;
s32 temp_a1_2;
s32 temp_ra;
s32 temp_s0;
s32 temp_s1;
s32 temp_t0;
s32 temp_v1;
s32 phi_s2;
s32 phi_s0;
s16 *phi_v0;
s32 phi_v1;
void *phi_v0_2;
s32 phi_a1;
s32 phi_s1;
s32 phi_a0;
s32 phi_a1_2;
s32 phi_v1_2;
s32 phi_a0_2;
s32 phi_a0_3;
s32 phi_a1_3;
s32 phi_a1_4;
phi_s2 = 0x28;
phi_s0 = 0x2E;
phi_a0_2 = arg0;
phi_a1_3 = arg1;
do {
phi_s1 = phi_s2;
phi_a0 = phi_a0_2;
phi_a1_2 = phi_a1_3;
phi_a0_3 = phi_a0_2;
phi_a1_4 = phi_a1_3;
if (phi_s2 < phi_s0) {
do {
if (phi_s2 < phi_s0) {
temp_a0 = phi_s0 - phi_s2;
temp_t0 = temp_a0 & 3;
temp_ra = arg0 + (phi_s1 * 0x280);
phi_v1_2 = phi_s2;
if (temp_t0 != 0) {
phi_v0 = temp_ra + (phi_s2 * 2);
phi_v1 = phi_s2;
do {
temp_v1 = phi_v1 + 1;
if (temp_a0 == 6) {
*phi_v0 = 0xF801;
} else {
*phi_v0 = 0xFFFF;
}
phi_v0 += 2;
phi_v1 = temp_v1;
} while ((temp_t0 + phi_s2) != temp_v1);
phi_v1_2 = temp_v1;
phi_a0_3 = temp_a0;
phi_a1_4 = temp_v1 * 2;
if (temp_v1 != phi_s0) {
goto block_10;
}
} else {
block_10:
temp_a1 = phi_v1_2 * 2;
phi_v0_2 = temp_ra + temp_a1;
phi_a1 = temp_a1;
do {
temp_a1_2 = phi_a1 + 8;
if (temp_a0 == 6) {
phi_v0_2->unk0 = 0xF801;
} else {
phi_v0_2->unk0 = 0xFFFF;
}
if (temp_a0 == 6) {
phi_v0_2->unk2 = 0xF801;
} else {
phi_v0_2->unk2 = 0xFFFF;
}
if (temp_a0 == 6) {
phi_v0_2->unk4 = 0xF801;
} else {
phi_v0_2->unk4 = 0xFFFF;
}
if (temp_a0 == 6) {
phi_v0_2->unk6 = 0xF801;
} else {
phi_v0_2->unk6 = 0xFFFF;
}
phi_v0_2 += 8;
phi_a1 = temp_a1_2;
phi_a0_3 = temp_a0;
phi_a1_4 = temp_a1_2;
} while (temp_a1_2 != (phi_s0 * 2));
}
}
temp_s1 = phi_s1 + 1;
phi_s1 = temp_s1;
phi_a0 = phi_a0_3;
phi_a1_2 = phi_a1_4;
} while (temp_s1 != phi_s0);
}
temp_s0 = phi_s0 - 1;
phi_s2 += 1;
phi_s0 = temp_s0;
phi_a0_2 = phi_a0;
phi_a1_3 = phi_a1_2;
} while (temp_s0 != 0x2C);
osWritebackDCacheAll(phi_a0, phi_a1_2, 0xF801, 0xFFFF);
osViSwapBuffer(arg0);
}
void crash_screen_draw_info(uint_ptr arg0, void *arg1) {
s32 temp_a2;
s32 temp_s0;
s32 temp_s1;
s32 temp_s1_3;
s32 temp_s1_4;
s32 temp_t0;
s32 temp_v1;
u32 temp_s1_2;
u32 temp_t3;
u32 temp_t4;
void *temp_s2;
void *temp_v0;
void *phi_v0;
s32 phi_v1;
s32 phi_a2;
s32 phi_t0;
s32 phi_s1;
u32 phi_s4;
s32 phi_s1_2;
u32 phi_s4_2;
s32 phi_s1_3;
u32 phi_s4_3;
void *phi_a3;
phi_t0 = 0;
do {
phi_a2 = 0;
phi_a3 = arg0 + (((D_800DC670 * 0x18) + phi_t0 + 0x30) * 0x280);
loop_2:
phi_v0 = phi_a3;
phi_v1 = 0;
loop_3:
temp_v1 = phi_v1 + 4;
phi_v0->unkCA = 1;
phi_v0->unkCC = 1;
phi_v0->unkCE = 1;
temp_v0 = phi_v0 + 8;
temp_v0->unkC0 = 1;
phi_v0 = temp_v0;
phi_v1 = temp_v1;
if (temp_v1 != 0x78) {
goto loop_3;
}
temp_a2 = phi_a2 + 1;
phi_a2 = temp_a2;
phi_a3 += 0x280;
if (temp_a2 < 0x10) {
goto loop_2;
}
temp_t0 = phi_t0 + 0x14;
phi_t0 = temp_t0;
} while ((temp_t0 < 0x3C) != 0);
temp_s0 = (D_800DC670 * 0x18) + 0x35;
func_800040C0(arg0, 0x6C, temp_s0, arg1->unk14 & 0xF);
func_800040C0(arg0, 0x74, temp_s0, 0x10U);
temp_s2 = arg1 + 0x20;
phi_s1 = 0xB4;
phi_s4 = temp_s2->unkFC;
do {
func_800040C0(arg0, phi_s1, temp_s0, phi_s4 & 0xF);
temp_s1 = phi_s1 - 8;
phi_s1 = temp_s1;
phi_s4 = phi_s4 >> 4;
} while ((temp_s1 < 0x7C) == 0);
temp_s1_2 = ((u32) temp_s2->unk100 >> 2) & 0x1F;
func_800040C0(arg0, 0xBC, temp_s0, 0x10U);
func_800040C0(arg0, 0xC4, temp_s0, temp_s1_2 >> 4);
func_800040C0(arg0, 0xCC, temp_s0, temp_s1_2 & 0xF);
phi_s1_2 = 0xB4;
phi_s4_2 = temp_s2->unkE4;
do {
func_800040C0(arg0, phi_s1_2, 0x49, phi_s4_2 & 0xF);
temp_s1_3 = phi_s1_2 - 8;
temp_t3 = phi_s4_2 >> 4;
phi_s1_2 = temp_s1_3;
phi_s4_2 = temp_t3;
} while ((temp_s1_3 < 0x7C) == 0);
temp_t4 = temp_s2->unkFC & ~3;
phi_s1_3 = 0xB4;
phi_s4_3 = temp_t3;
if (temp_t4 >= 0x80000001U) {
phi_s1_3 = 0xB4;
phi_s4_3 = temp_t3;
if (temp_t4 < 0x803FFF7FU) {
phi_s1_3 = 0xB4;
phi_s4_3 = *temp_t4;
}
}
do {
func_800040C0(arg0, phi_s1_3, 0x5D, phi_s4_3 & 0xF);
temp_s1_4 = phi_s1_3 - 8;
phi_s1_3 = temp_s1_4;
phi_s4_3 = phi_s4_3 >> 4;
} while ((temp_s1_4 < 0x7C) == 0);
osWritebackDCacheAll();
osViSwapBuffer(arg0);
}
void *get_faulted_thread(void) {
s32 temp_v0_2;
void *temp_v0;
void *temp_v1;
s32 phi_v0;
void *phi_v1;
temp_v0 = __osGetCurrFaultedThread();
if (temp_v0->unk4 != -1) {
phi_v0 = temp_v0->unk4;
phi_v1 = temp_v0;
loop_2:
if ((phi_v0 > 0) && (phi_v0 < 0x80) && ((phi_v1->unk12 & 3) != 0)) {
return phi_v1;
}
temp_v1 = phi_v1->unkC;
temp_v0_2 = temp_v1->unk4;
phi_v0 = temp_v0_2;
phi_v1 = temp_v1;
if (temp_v0_2 == -1) {
goto block_7;
}
goto loop_2;
}
block_7:
return NULL;
}
void thread9_crash_screen(s32 arg0) {
? sp44;
s32 temp_v1;
u16 temp_v0_2;
void *temp_v0;
osSetEventMesg(0xC, &D_80162D40, 0x10);
osSetEventMesg(0xA, &D_80162D40, 0x10);
D_80162D60 = 0;
loop_1:
osRecvMesg(&D_80162D40, &sp44, 1);
temp_v0 = get_faulted_thread();
D_80162D64 = temp_v0;
if (temp_v0 == 0) {
goto loop_1;
}
if (D_800DC670 != 0) {
goto block_10;
}
crash_screen_draw_square(pFramebuffer);
loop_4:
read_controllers();
temp_v0_2 = D_800DC4BC->unk6;
if (temp_v0_2 == 0) {
goto loop_4;
}
temp_v1 = D_80162D60;
if (temp_v0_2 != *(&D_800DC6FC + (temp_v1 * 2))) {
goto block_7;
}
D_80162D60 = (s32) (temp_v1 + 1);
goto block_8;
block_7:
D_80162D60 = 0;
block_8:
if (*(&D_800DC6FC + (D_80162D60 * 2)) != 0xFFFF) {
goto loop_4;
}
crash_screen_draw_info(pFramebuffer, D_80162D64);
block_10:
if (D_800DC670 >= 5) {
goto loop_1;
}
D_800DC670 = (s32) (D_800DC670 + 1);
goto loop_1;
}
// crash_screen_set_framebuffer
void func_800046AC(uintptr_t framebuffer) {
pFramebuffer = framebuffer;
}
void create_debug_thread(void) {
osCreateMesgQueue(&D_80162D40, &D_80162D58, 1);
osCreateThread(&D_80162790, 9, thread9_crash_screen, 0, &D_80162D40, 0x7F);
}
void start_debug_thread(void) {
osStartThread(&D_80162790);
}
*/
src/main.c
+21 -30
View File
@@ -41,10 +41,11 @@ extern struct SPTask *sCurrentAudioSPTask;
extern struct SPTask *sCurrentDisplaySPTask;
extern struct VblankHandler *gVblankHandler1;
extern struct VblankHandler *gVblankHandler2;
extern uintptr_t gPhysicalFramebuffers[3];
extern const f64 D_800EB640;
extern struct VblankHandler sSoundVblankHandler;
extern struct SPTask *gGfxSPTask;
extern OSMesgQueue D_8014EF58, D_8014EF88, D_8014EFD0, gIntrMesgQueue;
extern OSMesgQueue D_8014EF58, D_8014EF70, D_8014EF88, D_8014EFD0, gIntrMesgQueue;
extern OSMesgQueue sSoundMesgQueue;
extern OSMesg sSoundMesgBuf;
extern OSMesg D_8014F004, D_8014F058, D_8014F018;
@@ -87,11 +88,15 @@ extern u32 D_802F9F80;
extern struct SPTask* sNextDisplaySPTask;
extern u16 gFrameBufferIndex;
extern u16 sRenderingFramebuffer;
extern struct GfxPool gGfxPools[2];
extern s32 gGlobalTimer;
// Framebuffer rendering values (max 3)
extern u16 sRenderedFramebuffer; // = 0;
extern u16 sRenderingFramebuffer; // = 0;
// Declarations (in this file)
void thread1_idle(void *arg0);
void thread3_video(void *arg0);
@@ -349,7 +354,7 @@ void rendering_init(void) {
func_80000D3C(0);
func_80000CE8();
send_display_list(&gGfxPool->spTask);
gFrameBufferIndex++;
sRenderingFramebuffer++;
gGlobalTimer++;
}
@@ -360,38 +365,24 @@ void config_gfx_pool(void) {
gGfxSPTask = &gGfxPool->spTask;
}
// likely display_and_vsync from SM64
#ifdef MIPS_TO_C
// generated by mips_to_c commit cae1414eb1bf34873a831a523692fe29870a6f3b
void *func_80000F34(void) {
u16 temp_t2;
u16 temp_t5;
void display_and_vsync(void) {
profiler_log_thread5_time(2);
osRecvMesg(&D_8014EF88, &D_8014F098, 1);
send_display_list(gGfxPool + 0x28B20);
send_display_list(&gGfxPool->spTask);
profiler_log_thread5_time(3);
osRecvMesg(&D_8014EF70, &D_8014F098, 1);
osViSwapBuffer(((D_800DC55C * 4) + 0x80150000)->unk2A8 | 0x80000000);
osViSwapBuffer((void *) PHYSICAL_TO_VIRTUAL(gPhysicalFramebuffers[sRenderedFramebuffer]));
profiler_log_thread5_time(4);
osRecvMesg(&D_8014EF70, &D_8014F098, 1);
func_800046AC(((D_800DC55C * 4) + 0x80150000)->unk2A8);
temp_t2 = D_800DC55C + 1;
D_800DC55C = temp_t2;
if (3 == (temp_t2 & 0xFFFF)) {
D_800DC55C = (u16)0U;
func_800046AC(gPhysicalFramebuffers[sRenderedFramebuffer]);
if (++sRenderedFramebuffer == 3) {
sRenderedFramebuffer = 0;
}
temp_t5 = gFrameBufferIndex + 1;
gFrameBufferIndex = temp_t5;
if (3 == (temp_t5 & 0xFFFF)) {
gFrameBufferIndex = (u16)0U;
if (++sRenderingFramebuffer == 3) {
sRenderingFramebuffer = 0;
}
gGlobalTimer = (s32) (gGlobalTimer + 1);
return &gGlobalTimer;
gGlobalTimer++;
}
#else
GLOBAL_ASM("asm/non_matchings/main/func_80000F34.s")
#endif
void func_8000105C(void) {
bzero(SEG_80280000, 0xDF00);
@@ -1048,9 +1039,9 @@ void thread3_video(void *arg0) {
void *temp_v0;
void *phi_v0;
D_801502A8.unk0 = &D_8031F780;
D_801502A8.unk4 = &D_80344F80;
D_801502A8.unk8 = &D_8036A780;
gPhysicalFramebuffers.unk0 = &D_8031F780;
gPhysicalFramebuffers.unk4 = &D_80344F80;
gPhysicalFramebuffers.unk8 = &D_8036A780;
phi_v0 = &D_80344F80;
loop_1:
// potential unrolled loop?
@@ -1158,7 +1149,7 @@ loop_3:
read_controllers();
func_80001ECC();
func_80000CE8();
func_80000F34();
display_and_vsync();
goto loop_3;
}
#else