mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Fix some data / disassembly / undefined_syms (#2103)

Browse source 
* Fix some data splits

* Use real fault functions in cic6105.c

* Fix fault_n64.c data sizes

* Format
This commit is contained in:
cadmic 2024-08-29 09:05:50 -07:00 committed by GitHub
parent 7079005c83
commit 5e9704b464
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/boot/cic6105.c
View file

@ -2,10 +2,6 @@
#include "cic6105.h" #include "cic6105.h"
#include "fault.h" #include "fault.h"
// TODO N64 fault.c functions
void func_800AE1E0_unknown(s32, s32);
void func_800AE258_unknown(const char*, ...);
s32 func_80001714(void); s32 func_80001714(void);
extern u64 cic6105ucodeTextStart[]; extern u64 cic6105ucodeTextStart[];
@ -32,19 +28,19 @@ void CIC6105_FaultClient(void) {
s32 spStatus; s32 spStatus;
spStatus = IO_READ(SP_STATUS_REG); spStatus = IO_READ(SP_STATUS_REG);
func_800AE1E0_unknown(48, 200); Fault_SetCursor(48, 200);
if (spStatus & SP_STATUS_SIG7) { if (spStatus & SP_STATUS_SIG7) {
func_800AE258_unknown("OCARINA %08x %08x", B_80008EF8, B_80008EFC); Fault_Printf("OCARINA %08x %08x", B_80008EF8, B_80008EFC);
} else { } else {
func_800AE258_unknown("LEGEND %08x %08x", B_80008EF8, B_80008EFC); Fault_Printf("LEGEND %08x %08x", B_80008EF8, B_80008EFC);
} }
func_800AE1E0_unknown(40, 184); Fault_SetCursor(40, 184);
func_800AE258_unknown("ROM_F"); Fault_Printf("ROM_F");
func_800AE258_unknown(" [Creator:%s]", gBuildTeam); Fault_Printf(" [Creator:%s]", gBuildTeam);
func_800AE1E0_unknown(56, 192); Fault_SetCursor(56, 192);
func_800AE258_unknown("[Date:%s]", gBuildDate); Fault_Printf("[Date:%s]", gBuildDate);
func_800AE1E0_unknown(96, 32); Fault_SetCursor(96, 32);
func_800AE258_unknown("I LOVE YOU %08x", func_80001714()); Fault_Printf("I LOVE YOU %08x", func_80001714());
} }
void CIC6105_AddFaultClient(void) { void CIC6105_AddFaultClient(void) {

4
src/code/fault_n64.c
View file

@ -82,6 +82,7 @@ const char* sFpExceptionNames[] = {
}; };
u16 sFaultFontColor = GPACK_RGBA5551(255, 255, 255, 1); u16 sFaultFontColor = GPACK_RGBA5551(255, 255, 255, 1);
s32 D_800FF9C4[7] = { 0 }; // Unused (file padding?)
Input sFaultInputs[MAXCONTROLLERS]; Input sFaultInputs[MAXCONTROLLERS];
@ -95,7 +96,8 @@ vs32 sFaultExit;
vs32 gFaultMsgId; vs32 gFaultMsgId;
vs32 sFaultDisplayEnable; vs32 sFaultDisplayEnable;
OSThread* sFaultFaultedThread; OSThread* sFaultFaultedThread;
s32 B_80122570[0x10]; s32 B_80122570[16];
s32 B_801225B0[8]; // Unused (file padding?)
void Fault_SleepImpl(u32 ms) { void Fault_SleepImpl(u32 ms) {
Sleep_Msec(ms); Sleep_Msec(ms);

3
tools/disasm/ntsc-1.2/files_code.csv
View file

@ -276,7 +276,7 @@ EDD90,800FF470,src/code/sys_ucode
EDDA0,800FF480,src/code/sys_rumble EDDA0,800FF480,src/code/sys_rumble
EDDB0,800FF490,src/code/irqmgr EDDB0,800FF490,src/code/irqmgr
EDDD0,800FF4B0,src/code/code_n64dd_800AD4C0 EDDD0,800FF4B0,src/code/code_n64dd_800AD4C0
EE280,800FF960,src/code/fault_n64 EDE80,800FF560,src/code/fault_n64
EE300,800FF9E0,src/audio/lib/data EE300,800FF9E0,src/audio/lib/data
F0710,80101DF0,src/audio/lib/synthesis F0710,80101DF0,src/audio/lib/synthesis
F0740,80101E20,src/audio/lib/load F0740,80101E20,src/audio/lib/load
@ -445,6 +445,7 @@ offset,vram,.bss
110FB0,80122690,src/audio/general 110FB0,80122690,src/audio/general
1111B0,80122890,src/audio/sfx 1111B0,80122890,src/audio/sfx
1139C0,801250A0,src/audio/sequence 1139C0,801250A0,src/audio/sequence
1146E0,80125DC0,src/audio/data
114780,80125E60,src/audio/session_config 114780,80125E60,src/audio/session_config
11AC90,8012C370,src/code/system_malloc 11AC90,8012C370,src/code/system_malloc
11ACA0,8012C380,src/code/jpegdecoder 11ACA0,8012C380,src/code/jpegdecoder

1 offset vram .text
276 EDDB0 800FF490 src/code/irqmgr
277 EDDD0 800FF4B0 src/code/code_n64dd_800AD4C0
278 EE280 EDE80 800FF960 800FF560 src/code/fault_n64
279 EE300 800FF9E0 src/audio/lib/data
280 F0710 80101DF0 src/audio/lib/synthesis
281 F0740 80101E20 src/audio/lib/load
282 F0750 80101E30 src/audio/lib/thread
445 11ACA0 11AC90 8012C380 8012C370 src/code/jpegdecoder src/code/system_malloc
446 11ACB0 11ACA0 8012C390 8012C380 src/libultra/io/sptask src/code/jpegdecoder
447 11ACF0 11ACB0 8012C3D0 8012C390 src/libultra/io/motor src/libultra/io/sptask
448 11ACF0 8012C3D0 src/libultra/io/motor
449 11ADF0 8012C4D0 src/libultra/io/siacs
450 11AE10 8012C4F0 src/libultra/io/controller
451 11AEA0 8012C580 src/libultra/gu/position

2
undefined_syms.txt
View file

@ -17,8 +17,6 @@ func_80001720 = 0x80001720;
// cic6105.c // cic6105.c
cic6105ucodeTextStart = 0x80006720; cic6105ucodeTextStart = 0x80006720;
func_800AE258_unknown = 0x800AE258;
func_800AE1E0_unknown = 0x800AE1E0;
// code_n64dd_800AD410.c // code_n64dd_800AD410.c
func_800ADCD8_unknown = 0x800ADCD8; func_800ADCD8_unknown = 0x800ADCD8;