mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-07-27 14:53:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match func_80000D3C (renamed) and thread5_game_logic (#35)

Browse Source 
* match func_80000D3C + some renames

* Improved matching for init_game().

* Match thread5_game_logic

* Added osViModeTable and osCreateViManager from libultra
This commit is contained in:
iProgramInCpp
2021-10-16 14:18:38 -07:00
committed by GitHub
parent 3129da2f1c
commit 4c4efd28f8
13 changed files with 141 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80281C40.c
+1 -1
View File
@@ -52,7 +52,7 @@ void func_80281D00(void) {
func_802A53A4();
func_802A3E3C();
if (D_80287550 != 0xFFFF) {
func_80000D3C(0);
clear_framebuffer(0);
if (D_80287554 >= 4) {
D_800DC5C0 = 0;
D_800DC524 = D_80287550;
src/main.c
+60 -57
View File
@@ -1,4 +1,5 @@
#include <ultra64.h>
#include <PR/os.h>
#include <macros.h>
#include "types.h"
#include "config.h"
@@ -27,13 +28,13 @@ struct SPTask *create_next_audio_frame_task(void);
extern s32 D_800DC524;
extern s32 D_800DC52C;
extern OSThread D_801524C0;
extern OSThread D_80154670;
extern OSViMode D_800EA6C0, D_800EAF80;
extern s16 D_8015011C;
extern OSThread gIdleThread;
extern OSThread gVideoThread;
extern u16 D_8015011C;
extern OSMesgQueue D_8015F460;
extern OSMesg D_8015F3E0;
extern s32 D_80156820;
extern s32 gVideoThreadStack;
extern struct SPTask *gActiveSPTask;
extern s16 sNumVBlanks;
extern f32 D_800DC594;
@@ -129,16 +130,17 @@ void create_thread(OSThread *thread, OSId id, void (*entry)(void *), void *arg,
void main_func(void) {
osInitialize();
create_thread(&D_801524C0, 1, thread1_idle, NULL, &D_80154670, 100);
osStartThread(&D_801524C0);
//! Why is this using the gVideoThread as idle stack?
create_thread(&gIdleThread, 1, thread1_idle, NULL, &gVideoThread, 100);
osStartThread(&gIdleThread);
}
void thread1_idle(void *arg0) {
osCreateViManager(OS_PRIORITY_VIMGR);
if (osTvType == 1) {
osViSetMode(&D_800EA6C0);
if (osTvType == TV_TYPE_NTSC) {
osViSetMode(&osViModeTable[OS_VI_NTSC_LAN1]);
} else {
osViSetMode(&D_800EAF80);
osViSetMode(&osViModeTable[OS_VI_MPAL_LAN1]);
}
osViBlack(TRUE);
osViSetSpecialFeatures(OS_VI_GAMMA_OFF);
@@ -146,14 +148,12 @@ void thread1_idle(void *arg0) {
D_8015011C = (s16) osResetType;
create_debug_thread();
start_debug_thread();
create_thread(&D_80154670, 3, &thread3_video, arg0, &D_80156820, 100);
osStartThread(&D_80154670);
create_thread(&gVideoThread, 3, &thread3_video, arg0, &gVideoThreadStack, 100);
osStartThread(&gVideoThread);
osSetThreadPri(NULL, 0);
// halt
while (1) {
;
}
while (1);
}
void setup_mesg_queues(void) {
@@ -339,14 +339,14 @@ void func_80000CE8(void) {
}
// clear_frame_buffer from SM64, with a few edits
#ifdef NON_MATCHING
void func_80000D3C(s32 arg0) {
//! TODO: Why did void* work for matching
void *clear_framebuffer(s32 color) {
gDPPipeSync(gDisplayListHead++);
gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
gDPSetCycleType(gDisplayListHead++, G_CYC_FILL);
gDPSetFillColor(gDisplayListHead++, arg0);
gDPSetFillColor(gDisplayListHead++, color);
gDPFillRectangle(gDisplayListHead++, 0, 0, SCREEN_WIDTH - 1,
SCREEN_HEIGHT - 1);
@@ -354,9 +354,6 @@ void func_80000D3C(s32 arg0) {
gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE);
}
#else
GLOBAL_ASM("asm/non_matchings/main/func_80000D3C.s")
#endif
void rendering_init(void) {
gGfxPool = &gGfxPools[0];
@@ -364,7 +361,7 @@ void rendering_init(void) {
gGfxSPTask = &gGfxPool->spTask;
gDisplayListHead = &gGfxPool->buffer[0x3418];
func_80000CA8();
func_80000D3C(0);
clear_framebuffer(0);
func_80000CE8();
send_display_list(&gGfxPool->spTask);
sRenderingFramebuffer++;
@@ -463,34 +460,39 @@ GLOBAL_ASM("asm/non_matchings/main/dma_copy.s")
// Resembles setup_game_memory from SM64
#ifdef NON_MATCHING
void init_game(void) {
s32 sp40;
s32 sp38;
s32 sp38;//0x38(sp)
u32 *sp2C;
s32 temp_a1;
s32 temp_t7;
s32 temp_t2;
s32 sp40;
s32 texture_seg;
//u32 temp_a1;
UNUSED s16 unknown_padding;
func_800010CC();
gHeapEndPtr = 0x8028DF00;
gHeapEndPtr = SEG_8028DF00;
set_segment_base_addr(0, 0x80000000);
func_802A7CF0(&D_801978D0, 0x80242F00);
func_80000BEC();
osInvalDCache(0x802BA370, 0x5810);
osPiStartDma(&D_8014F0A0, 0, 0, &_data_802BA370SegmentRomStart, 0x802BA370, 0x5810, &D_8014EF58);
osInvalDCache(SEG_802BA370, 0x5810);
osPiStartDma(&D_8014F0A0, 0, 0, &_data_802BA370SegmentRomStart, SEG_802BA370, 0x5810, &D_8014EF58);
osRecvMesg(&D_8014EF58, &D_8014F098, 1);
set_segment_base_addr(2, func_802A7D70(&_data_segment2SegmentRomStart, &_data_segment2SegmentRomEnd));
temp_t2 = ALIGN16((u32)&_common_texturesSegmentRomEnd - (u32)&_common_texturesSegmentRomStart);
sp2C = 0x8028DF00 - temp_t2;
osPiStartDma(&D_8014F0A0, 0, 0, &_common_texturesSegmentRomStart, 0x8028DF00 - temp_t2, temp_t2, &D_8014EF58);
texture_seg = ALIGN16((u32)&_common_texturesSegmentRomEnd - (u32)&_common_texturesSegmentRomStart);
sp2C = SEG_8028DF00 - texture_seg;
osPiStartDma(&D_8014F0A0, 0, 0, &_common_texturesSegmentRomStart, SEG_8028DF00 - texture_seg, texture_seg, &D_8014EF58);
osRecvMesg(&D_8014EF58, &D_8014F098, 1);
temp_a1 = gPrevLoadedAddress;
sp38 = temp_a1;
//need to match this
sp40 = texture_seg + 4;
sp40 = ALIGN16(sp2C[1]);
mio0decode(sp2C, temp_a1);
set_segment_base_addr(0xD, temp_a1);
temp_t7 = sp40 + gPrevLoadedAddress;
gPrevLoadedAddress = temp_t7;
D_8015F734 = temp_t7;
sp38 = gPrevLoadedAddress;
mio0decode(texture_seg, sp38);
set_segment_base_addr(0xD, sp38);
gPrevLoadedAddress += sp40;
D_8015F734 = gPrevLoadedAddress;
}
#else
GLOBAL_ASM("asm/non_matchings/main/init_game.s")
@@ -498,7 +500,7 @@ GLOBAL_ASM("asm/non_matchings/main/init_game.s")
void func_80001404(void) {
D_800DC524 = 0;
func_80000D3C(0);
clear_framebuffer(0);
}
#ifdef MIPS_TO_C
@@ -1190,8 +1192,12 @@ void func_80002684(void) {
GLOBAL_ASM("asm/non_matchings/main/func_80002684.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit ffee479fae41a1cdc3e454e9b9d75bbd226a160f
extern OSMesg* D_8014F008;
extern OSMesg* D_8014F00C;
extern s32 D_8014EF48;
extern s32 D_800DC600;
extern s32 D_8015F8B8, D_8015F8BC, D_8015F8C0, D_8015F8C4, D_8015F8C8, D_8015F8CC;
void thread5_game_logic(s32 arg0) {
osCreateMesgQueue(&D_8014EF88, &D_8014F00C, 1);
osCreateMesgQueue(&D_8014EF70, &D_8014F008, 1);
@@ -1209,23 +1215,20 @@ void thread5_game_logic(s32 arg0) {
rendering_init();
read_controllers();
func_800C5CB8();
loop_3:
func_800CB2C4();
if (D_800DC50C != D_800DC524) {
D_800DC50C = (s32) D_800DC524;
func_80002684();
while(1) {
func_800CB2C4();
if (D_800DC524 != D_800DC50C) {
D_800DC50C = (s32) D_800DC524;
func_80002684();
}
profiler_log_thread5_time(0);
config_gfx_pool();
read_controllers();
func_80001ECC();
func_80000CE8();
display_and_vsync();
}
profiler_log_thread5_time(0);
config_gfx_pool();
read_controllers();
func_80001ECC();
func_80000CE8();
display_and_vsync();
goto loop_3;
}
#else
GLOBAL_ASM("asm/non_matchings/main/thread5_game_logic.s")
#endif
void thread4_audio(UNUSED s32 arg0) {
UNUSED u32 unused[3];
src/os/osCreateViManager.c
+1 -3
View File
@@ -1,4 +1,5 @@
#include "libultra_internal.h"
#include <macros.h>
#define OS_VI_MANAGER_MESSAGE_BUFF_SIZE 5
@@ -15,7 +16,6 @@ extern void __osTimerServicesInit(void);
extern void __osTimerInterrupt(void);
extern OSTime __osCurrentTime;
extern u32 __osBaseCounter;
extern u32 D_80365DA8;
extern u32 __osViIntrCount;
void viMgrMain(void *);
@@ -47,9 +47,7 @@ void osCreateViManager(OSPri pri) {
viMgrMainArgs.eventQueue = &__osViMesgQueue;
viMgrMainArgs.accessQueue = NULL;
viMgrMainArgs.dma_func = NULL;
#if defined(VERSION_EU) || defined(VERSION_SH)
viMgrMainArgs.edma_func = NULL;
#endif
osCreateThread(&viMgrThread, 0, viMgrMain, (void *) &viMgrMainArgs, &viMgrStack[0x400], pri);
__osViInit();
src/os/osInitialize.c
+1 -2
View File
@@ -13,12 +13,11 @@ typedef struct {
extern u32 D_80194040; // maybe initialized?
extern s32 __osLeoInterrupt;
extern u32 D_800EA5F0;
u64 osClockRate = 62500000;
u32 D_800EA5E8 = 0;
u32 __OSGlobalIntMask = OS_IM_ALL;
u32 D_800EA5F0 = 0;
#define EXCEPTION_TLB_MISS 0x80000000
#define EXCEPTION_XTLB_MISS 0x80000080
src/os/osViTable.c
-4
View File
@@ -324,7 +324,6 @@ OSViMode osViModeTable[] = {
/*vBurst*/ 918020,
/*vIntr*/ 2 } } },
#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH)
/*osViModePalLpn1*/
{ /*type*/ 14,
/*comRegs*/
@@ -773,8 +772,6 @@ OSViMode osViModeTable[] = {
/*vStart*/ 6226489,
/*vBurst*/ 852585,
/*vIntr*/ 2 } } },
#endif
#if defined(VERSION_US) || defined(VERSION_EU) || defined (VERSION_SH)
/*osViModePalLpn1*/
{ /*type*/ 28,
/*comRegs*/
@@ -1097,5 +1094,4 @@ OSViMode osViModeTable[] = {
/*vStart*/ 2425343,
/*vBurst*/ 918020,
/*vIntr*/ 2 } } }
#endif
};