mirror of
https://github.com/Druthulu/BFM-decomp
synced 2026-09-27 05:56:00 -04:00
0cda15c6de
Pre-existing latent breakage (Phase-21 close commit:0292, "+62 PsyQ names"), found during T5b's R22 fleet verify. A genuinely-clean `make clean` + re-extract + build of `main` failed with dozens of `can't open asm/nonmatchings/800c3/func_*.s` — clean-rebuild broken since Phase 21, masked all along by incremental builds reusing stale pre-rename .s/.o (the exact R22 failure mode). - Root cause (byte-proven): Phase-21 xdedup renamed 62 PsyQ library functions to their proper names (InitHeap, FlushCache, GetTPage, SysEnqIntRP, SpuWrite, CdMix, __main …) in symbols.us.txt, but never regenerated/renamed the committed src/*.c stub refs that call them by the OLD func_<ADDR> name. splat's FRESH regeneration of a stub .c uses the CURATED names (move src/800c3.c aside -> splat writes INCLUDE_ASM(InitHeap) + emits InitHeap.s); the committed stubs were simply stale. - Fix: rename all 62 INCLUDE_ASM(func_<ADDR>) -> the curated name across 12 files (800c.c 1, 800c3.c 22, apicard1/2/4 4/6/2, boot.c 1, libcd1.c 8, libetc.c 6, libgpu.c 3, sgap.c 1, snd1.c 7, snd2.c 1). Pure rename to match splat's canonical output; byte-neutral. - VERIFIED: main clean-builds 143dbb89 from a fully clean tree; full clean fleet check-all 136/136. - Lesson (cookbook): a symbols.us.txt rename must be propagated to (a) shared-macro bodies (engine_core.h — the T5b GetTPage fix) AND (b) INCLUDE_ASM stub refs (this), AND verified by a genuinely-clean check-all (make clean + full re-extract), never incremental. Added a lint check.
214 lines
5.6 KiB
C
214 lines
5.6 KiB
C
#include "common.h"
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", StSetRing);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", DecDCToutCallback);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800430DC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", TOC_OBJ_220);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043300);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", EVENT_OBJ_84);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", def_cbsync);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", def_cbready);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", def_cbread);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043410);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043420);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdLastCom);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043440);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043450);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", SYS_OBJ_98);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800434BC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdSetDebug);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdComstr);
|
|
|
|
void SYS_OBJ_110(void) {
|
|
}
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdIntstr);
|
|
|
|
void SYS_OBJ_144(void) {
|
|
}
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_8004355C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_8004357C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_8004359C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800435B4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800435CC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043704);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043830);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", SYS_OBJ_538);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdMix);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043994);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800439B4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800439D4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800439F8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdIntToPos);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdPosToInt);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80043B9C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_64);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_26C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_36C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_3B8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_43C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_4C0);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_570);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80044124);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_6B4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_6E4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_7DC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800443A4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_93C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_96C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_AA4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80044670);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_DAC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_DDC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_EC8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CD_vol);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CD_flush);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CD_initvol);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CD_initintr);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80044D38);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80044F24);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_14A4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CD_getsector);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CD_getsector2);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CD_set_test_parmnum);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", callback);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", BIOS_OBJ_1728);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdSearchFile);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_F8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_29C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_2A8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80045640);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80045660);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_5A4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80045940);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_650);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800459E8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_7F4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_810);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", ISO9660_OBJ_8F4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80045C94);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", cb_read);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CDREAD_OBJ_A4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CDREAD_OBJ_1A4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", cb_data);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800460CC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CDREAD_OBJ_5C0);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdReadBreak);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_8004637C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CDREAD_OBJ_6B8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80046480);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CDREAD_OBJ_810);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_8004654C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80046564);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CdRead2);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", CDREAD2_OBJ_50);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", StCdInterrupt2);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_80046630);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", TYPE_OBJ_104);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_8004674C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", TYPE_OBJ_178);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", TYPE_OBJ_254);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", StClearRing);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/libcd1", func_800468FC);
|