From 67a289e51fea2125590d22748dbf39068caf5e75 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 20:12:46 -0500 Subject: [PATCH] Added bss for unknown_0C4800 & unknown_0C7F50 --- bss.txt | 122 ---------------------------------- src/unknown_0AEE70.c | 2 +- src/unknown_0C4800.c | 155 ++++++++++++++++++++++++++++++++++++++----- src/unknown_0C7F50.c | 8 ++- undefined_syms.txt | 121 +-------------------------------- 5 files changed, 146 insertions(+), 262 deletions(-) diff --git a/bss.txt b/bss.txt index a7c9b8f0..131d7195 100644 --- a/bss.txt +++ b/bss.txt @@ -49,128 +49,6 @@ unknown_09F8F0 unknown_0AEE70 unknown_0C4800 -piThreadStack; -D_80129BB0; -D_80129FB0; -D_80129FBC; - - -unknown_0B8920 -D_80129FC0; -D_80129FC4; -D_80129FC8; -D_80129FCC; -D_80129FE8; -D_80129FF0; -D_8012A008; -D_8012A00C; -D_8012A018; -D_8012A01C; -D_8012A020; -D_8012A028; -D_8012A078; -D_8012A07C; -D_8012A080; -D_8012A084; -D_8012A088; -D_8012A08C; -D_8012A090; -D_8012A094; -D_8012A098; -D_8012A09C; -D_8012A0A0; -D_8012A0A4; -D_8012A0A8; -D_8012A0AC; -D_8012A0B0; -D_8012A0B4; -D_8012A0B8; -D_8012A0BC; -D_8012A0C0; -D_8012A0C4; -D_8012A0C8; -D_8012A0CC; -D_8012A0D0; -D_8012A0D4; -D_8012A0D8; -D_8012A0DC; -D_8012A0E0; -D_8012A0E8; -D_8012A1E8; -D_8012A5E8; -D_8012A5F4; -D_8012A600; -D_8012A720; -D_8012A724; -D_8012A728; -D_8012A730; -D_8012A734; -D_8012A735; -D_8012A736; -D_8012A737; -D_8012A738; -D_8012A73C; -D_8012A740; -D_8012A744; -D_8012A748; -D_8012A74C; -D_8012A750; -D_8012A754; -D_8012A758; -D_8012A75C; -D_8012A760; -D_8012A764; -D_8012A768; -D_8012A76C; -D_8012A770; -D_8012A774; -D_8012A778; -D_8012A77C; -D_8012A780; -D_8012A784; -D_8012A785; -D_8012A786; -D_8012A787; -D_8012A788; -D_8012A789; -D_8012A78A; -D_8012A78C; -D_8012A78E; -D_8012A790; -D_8012A798; -D_8012A7A0; -D_8012A7A4; -D_8012A7A8; -D_8012A7AA; -D_8012A7AC; -D_8012A7AE; -D_8012A7B0; -D_8012A7B2; -D_8012A7B4; -D_8012A7B6; -D_8012A7B8; -D_8012A7BA; -D_8012A7C0; -D_8012A7C8; -D_8012A7D0; -D_8012A7D4; -D_8012A7E0; -D_8012A7E4; -D_8012A7E8; -D_8012A7EC; -D_8012A7F0; -D_8012A7F4; - - -unknown_0C4800 -piThread; -piEventQueue; -piEventBuf; -gzip_bit_buffer; -gzip_num_bits; -D_8012AAD8; -D_8012AAE0; - unknown_0C7F50 D_8012AAF0; diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index a0417f2b..8f9cf5d6 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -255,7 +255,7 @@ s32 D_8012991C; s32 D_80129920; s32 D_80129924; s32 D_80129928[34]; -s32 D_801299B0; +s32 D_801299B0[64]; /******************************/ diff --git a/src/unknown_0C4800.c b/src/unknown_0C4800.c index 4cf1898a..fc62a4a7 100644 --- a/src/unknown_0C4800.c +++ b/src/unknown_0C4800.c @@ -5,17 +5,6 @@ #include "macros.h" #include "libultra_internal.h" -#define OS_PIM_STACKSIZE 4096 - -extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled -extern OSDevMgr __osPiDevMgr; -extern u8 piThreadStack[OS_PIM_STACKSIZE];//piThreadStack -extern OSThread piThread; //piThread -extern OSMesgQueue piEventQueue; //piEventQueue -extern OSMesg piEventBuf[1]; //piEventBuf -extern OSMesgQueue piAccessQueue; //piAccessQueue -void __osDevMgrMain(void); - /************ .data ************/ // Fast3D (F3DDKR) display list @@ -57,7 +46,124 @@ u8* gzip_inflate_output = NULL; /*******************************/ -extern s32 D_8012A7E0; +/************ .bss ************/ + +#define OS_PIM_STACKSIZE 4096 +u8 piThreadStack[256];//piThreadStack[OS_PIM_STACKSIZE]; + +s32 D_80129BB0[256]; +s32 D_80129FB0[3]; +s32 D_80129FBC; +s32 D_80129FC0; +s32 D_80129FC4; +s32 D_80129FC8; +s32 D_80129FCC; +s32 D_80129FD0[4]; +s32 D_80129FE0[2]; +s32 D_80129FE8; +s32 D_80129FF0[6]; +s32 D_8012A008; +s32 D_8012A00C; +s32 D_8012A010; +s32 D_8012A014; +s32 D_8012A018; +s32 D_8012A01C; +s32 D_8012A020[2]; +s32 D_8012A028[20]; +s32 D_8012A078; +s32 D_8012A07C; +s32 D_8012A080; +s32 D_8012A084; +s32 D_8012A088; +s32 D_8012A08C; +s32 D_8012A090; +s32 D_8012A094; +s32 D_8012A098; +s32 D_8012A09C; +s32 D_8012A0A0; +s32 D_8012A0A4; +s32 D_8012A0A8; +s32 D_8012A0AC; +s32 D_8012A0B0; +s32 D_8012A0B4; +s32 D_8012A0B8; +s32 D_8012A0BC; +s32 D_8012A0C0; +s32 D_8012A0C4; +s32 D_8012A0C8; +s32 D_8012A0CC; +s32 D_8012A0D0; +s32 D_8012A0D4; +s32 D_8012A0D8; +s32 D_8012A0DC; +s32 D_8012A0E0; +s32 D_8012A0E8[64]; +s32 D_8012A1E8[256]; +s32 D_8012A5E8[3]; +s32 D_8012A5F4; +s32 D_8012A5F8; +s32 D_8012A5FC; +s32 D_8012A600[72]; +s32 D_8012A720; +s32 D_8012A724; +s32 D_8012A728[2]; +s32 D_8012A730; +s8 D_8012A734; +s8 D_8012A735; +s8 D_8012A736; +s8 D_8012A737; +s32 D_8012A738; +s32 D_8012A73C; +s32 D_8012A740; +s32 D_8012A744; +s32 D_8012A748; +s32 D_8012A74C; +s32 D_8012A750; +s32 D_8012A754; +s32 D_8012A758; +s32 D_8012A75C; +s32 D_8012A760; +s32 D_8012A764; +s32 D_8012A768; +s32 D_8012A76C; +s32 D_8012A770; +s32 D_8012A774; +s32 D_8012A778; +s32 D_8012A77C; +s32 D_8012A780; +s8 D_8012A784; +s8 D_8012A785; +s8 D_8012A786; +s8 D_8012A787; +s8 D_8012A788; +s8 D_8012A789; +s8 D_8012A78A; +s16 D_8012A78C; +s16 D_8012A78E; +s32 D_8012A790[2]; +s32 D_8012A798; +s32 D_8012A79C; +s32 D_8012A7A0; +s32 D_8012A7A4; +s16 D_8012A7A8; +s16 D_8012A7AA; +s16 D_8012A7AC; +s16 D_8012A7AE; +s16 D_8012A7B0; +s16 D_8012A7B2; +s16 D_8012A7B4; +s16 D_8012A7B6; +s16 D_8012A7B8; +s16 D_8012A7BA; +s32 D_8012A7C0[2]; +s32 D_8012A7C8; +s32 D_8012A7CC; +s32 D_8012A7D0; +s32 D_8012A7D4; +s32 D_8012A7D8; +s32 D_8012A7DC; +s32 D_8012A7E0; +s32 D_8012A7E4; /* Size: 0x28 bytes */ typedef struct unk8012A7E8_24 { @@ -97,13 +203,26 @@ typedef struct unk8012A7E8 { unk8012A7E8_24 *unk24; } unk8012A7E8; -extern unk8012A7E8 (*D_8012A7E8)[1]; -extern s32 D_8012A7F0; -extern s8 D_8012A7F4; -extern s32 D_8012AAD8; -extern u32 gzip_num_bits; -extern u32 gzip_bit_buffer; +unk8012A7E8 (*D_8012A7E8)[1]; +s32 D_8012A7EC; +s32 D_8012A7F0; +s8 D_8012A7F4; +s32 D_8012A7F8; +s32 D_8012A7FC; +OSThread piThread; //piThread +s32 D_8012A9B0[64]; +OSMesgQueue piEventQueue; //piEventQueue +OSMesg piEventBuf[2]; //piEventBuf +u32 gzip_bit_buffer; +u32 gzip_num_bits; +s32 D_8012AAD8; +/******************************/ + +extern OSMesgQueue piAccessQueue; //piAccessQueue +extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled +extern OSDevMgr __osPiDevMgr; +void __osDevMgrMain(void); #if 1 GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C3C00.s") diff --git a/src/unknown_0C7F50.c b/src/unknown_0C7F50.c index d0adc4bc..abd22408 100644 --- a/src/unknown_0C7F50.c +++ b/src/unknown_0C7F50.c @@ -16,9 +16,11 @@ s32 D_800E377C = 0; /************ .bss ************/ -extern OSMesgQueue D_8012ACA0; -extern OSMesg D_8012ACB8; -extern OSThread D_8012AAF0; +s32 D_8012AAE0[4]; +OSThread D_8012AAF0; +OSMesgQueue D_8012ACA0; +OSMesg D_8012ACB8; + extern void *D_8012CCC0; /*****************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 1fdfd62a..27b204b3 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,126 +25,11 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -piThreadStack = 0x80129AB0; -D_80129BB0 = 0x80129BB0; -D_80129FB0 = 0x80129FB0; -D_80129FBC = 0x80129FBC; -D_80129FC0 = 0x80129FC0; -D_80129FC4 = 0x80129FC4; -D_80129FC8 = 0x80129FC8; -D_80129FCC = 0x80129FCC; -D_80129FE8 = 0x80129FE8; -D_80129FF0 = 0x80129FF0; -D_8012A008 = 0x8012A008; -D_8012A00C = 0x8012A00C; -D_8012A018 = 0x8012A018; -D_8012A01C = 0x8012A01C; -D_8012A020 = 0x8012A020; -D_8012A028 = 0x8012A028; -D_8012A078 = 0x8012A078; -D_8012A07C = 0x8012A07C; -D_8012A080 = 0x8012A080; -D_8012A084 = 0x8012A084; -D_8012A088 = 0x8012A088; -D_8012A08C = 0x8012A08C; -D_8012A090 = 0x8012A090; -D_8012A094 = 0x8012A094; -D_8012A098 = 0x8012A098; -D_8012A09C = 0x8012A09C; -D_8012A0A0 = 0x8012A0A0; -D_8012A0A4 = 0x8012A0A4; -D_8012A0A8 = 0x8012A0A8; -D_8012A0AC = 0x8012A0AC; -D_8012A0B0 = 0x8012A0B0; -D_8012A0B4 = 0x8012A0B4; -D_8012A0B8 = 0x8012A0B8; -D_8012A0BC = 0x8012A0BC; -D_8012A0C0 = 0x8012A0C0; -D_8012A0C4 = 0x8012A0C4; -D_8012A0C8 = 0x8012A0C8; -D_8012A0CC = 0x8012A0CC; -D_8012A0D0 = 0x8012A0D0; -D_8012A0D4 = 0x8012A0D4; -D_8012A0D8 = 0x8012A0D8; -D_8012A0DC = 0x8012A0DC; -D_8012A0E0 = 0x8012A0E0; -D_8012A0E8 = 0x8012A0E8; -D_8012A1E8 = 0x8012A1E8; -D_8012A5E8 = 0x8012A5E8; -D_8012A5F4 = 0x8012A5F4; -D_8012A600 = 0x8012A600; -D_8012A720 = 0x8012A720; -D_8012A724 = 0x8012A724; -D_8012A728 = 0x8012A728; -D_8012A730 = 0x8012A730; -D_8012A734 = 0x8012A734; -D_8012A735 = 0x8012A735; -D_8012A736 = 0x8012A736; -D_8012A737 = 0x8012A737; -D_8012A738 = 0x8012A738; -D_8012A73C = 0x8012A73C; -D_8012A740 = 0x8012A740; -D_8012A744 = 0x8012A744; -D_8012A748 = 0x8012A748; -D_8012A74C = 0x8012A74C; -D_8012A750 = 0x8012A750; -D_8012A754 = 0x8012A754; -D_8012A758 = 0x8012A758; -D_8012A75C = 0x8012A75C; -D_8012A760 = 0x8012A760; -D_8012A764 = 0x8012A764; -D_8012A768 = 0x8012A768; -D_8012A76C = 0x8012A76C; -D_8012A770 = 0x8012A770; -D_8012A774 = 0x8012A774; -D_8012A778 = 0x8012A778; -D_8012A77C = 0x8012A77C; -D_8012A780 = 0x8012A780; -D_8012A784 = 0x8012A784; -D_8012A785 = 0x8012A785; -D_8012A786 = 0x8012A786; -D_8012A787 = 0x8012A787; -D_8012A788 = 0x8012A788; -D_8012A789 = 0x8012A789; -D_8012A78A = 0x8012A78A; -D_8012A78C = 0x8012A78C; -D_8012A78E = 0x8012A78E; -D_8012A790 = 0x8012A790; -D_8012A798 = 0x8012A798; -D_8012A7A0 = 0x8012A7A0; -D_8012A7A4 = 0x8012A7A4; -D_8012A7A8 = 0x8012A7A8; -D_8012A7AA = 0x8012A7AA; -D_8012A7AC = 0x8012A7AC; -D_8012A7AE = 0x8012A7AE; -D_8012A7B0 = 0x8012A7B0; -D_8012A7B2 = 0x8012A7B2; -D_8012A7B4 = 0x8012A7B4; -D_8012A7B6 = 0x8012A7B6; -D_8012A7B8 = 0x8012A7B8; -D_8012A7BA = 0x8012A7BA; -D_8012A7C0 = 0x8012A7C0; -D_8012A7C8 = 0x8012A7C8; -D_8012A7D0 = 0x8012A7D0; -D_8012A7D4 = 0x8012A7D4; -D_8012A7E0 = 0x8012A7E0; -D_8012A7E4 = 0x8012A7E4; -D_8012A7E8 = 0x8012A7E8; -D_8012A7EC = 0x8012A7EC; -D_8012A7F0 = 0x8012A7F0; -D_8012A7F4 = 0x8012A7F4; -piThread = 0x8012A800; -piEventQueue = 0x8012AAB0; -piEventBuf = 0x8012AAC8; -gzip_bit_buffer = 0x8012AAD0; -gzip_num_bits = 0x8012AAD4; -D_8012AAD8 = 0x8012AAD8; -D_8012AAE0 = 0x8012AAE0; -D_8012AAF0 = 0x8012AAF0; -D_8012ACA0 = 0x8012ACA0; -D_8012ACB8 = 0x8012ACB8; + viThreadStack = 0x8012C130; + D_8012CCC0 = 0x8012CCC0; + __osEventStateTab = 0x8012CCD0; D_8012CD50 = 0x8012CD50; D_8012CD8C = 0x8012CD8C;