1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00

[iQue] Use CPP includes in spec and update for iQue (#2399)

* Update spec for iQue

* Use CPP includes for spec overlays, scenes, and libultra

* Fix iQue + DEBUG_FEATURES

* Define BBPLAYER, merge function definitions

* Add Makefile dependency on spec_includes

* Fix libc order for iQue

* Match src/libultra/bb/sa/common.c to fix linker errors

* Use C versions of getcount/setcompare for iQue

* Format

* Small fixes to line up boot segment

* Remove zlib.c
This commit is contained in:
cadmic 2025-01-11 19:44:14 -08:00 committed by GitHub
parent 8d213e61cf
commit 7aa9808b7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 15211 additions and 14770 deletions

View file

@ -408,8 +408,10 @@ ROMC := $(ROM:.z64=-compressed.z64)
ELF := $(ROM:.z64=.elf) ELF := $(ROM:.z64=.elf)
MAP := $(ROM:.z64=.map) MAP := $(ROM:.z64=.map)
LDSCRIPT := $(ROM:.z64=.ld) LDSCRIPT := $(ROM:.z64=.ld)
# description of ROM segments # description of ROM segments
SPEC := spec SPEC := spec
SPEC_INCLUDES := $(wildcard spec_includes/*.inc)
SRC_DIRS := $(shell find src -type d) SRC_DIRS := $(shell find src -type d)
UNDECOMPILED_DATA_DIRS := $(shell find data -type d) UNDECOMPILED_DATA_DIRS := $(shell find data -type d)
@ -569,6 +571,7 @@ ifeq ($(PLATFORM),IQUE)
# Some files are compiled with EGCS on iQue # Some files are compiled with EGCS on iQue
EGCS_O_FILES += $(BUILD_DIR)/src/boot/boot_main.o EGCS_O_FILES += $(BUILD_DIR)/src/boot/boot_main.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/idle.o EGCS_O_FILES += $(BUILD_DIR)/src/boot/idle.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/inflate.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/is_debug_ique.o EGCS_O_FILES += $(BUILD_DIR)/src/boot/is_debug_ique.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/z_locale.o EGCS_O_FILES += $(BUILD_DIR)/src/boot/z_locale.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/z_std_dma.o EGCS_O_FILES += $(BUILD_DIR)/src/boot/z_std_dma.o
@ -840,7 +843,7 @@ $(O_FILES): | asset_files
.PHONY: o_files asset_files .PHONY: o_files asset_files
$(BUILD_DIR)/$(SPEC): $(SPEC) $(BUILD_DIR)/$(SPEC): $(SPEC) $(SPEC_INCLUDES)
$(CPP) $(CPPFLAGS) $< | $(BUILD_DIR_REPLACE) > $@ $(CPP) $(CPPFLAGS) $< | $(BUILD_DIR_REPLACE) > $@
$(LDSCRIPT): $(BUILD_DIR)/$(SPEC) $(LDSCRIPT): $(BUILD_DIR)/$(SPEC)

View file

@ -64,7 +64,7 @@ void __osFreeDebug(Arena* arena, void* ptr, const char* file, int line);
void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, int line); void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, int line);
#endif #endif
#if PLATFORM_GC && DEBUG_FEATURES #if !PLATFORM_N64 && DEBUG_FEATURES
void __osDisplayArena(Arena* arena); void __osDisplayArena(Arena* arena);
extern u32 __osMalloc_FreeBlockTest_Enable; extern u32 __osMalloc_FreeBlockTest_Enable;
#endif #endif

14899
spec

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,91 @@
include "$(BUILD_DIR)/src/libultra/io/piacs.o"
include "$(BUILD_DIR)/src/libultra/os/sendmesg.o"
include "$(BUILD_DIR)/src/libultra/os/stopthread.o"
include "$(BUILD_DIR)/src/libultra/io/viextendvstart.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallan1.o"
include "$(BUILD_DIR)/src/libultra/os/recvmesg.o"
include "$(BUILD_DIR)/src/libultra/os/initialize.o"
include "$(BUILD_DIR)/src/libultra/libc/ll.o"
include "$(BUILD_DIR)/src/libultra/os/exceptasm.o"
include "$(BUILD_DIR)/src/libultra/os/thread.o"
include "$(BUILD_DIR)/src/libultra/os/destroythread.o"
include "$(BUILD_DIR)/src/libultra/libc/bzero.o"
include "$(BUILD_DIR)/src/libultra/os/parameters.o"
include "$(BUILD_DIR)/src/libultra/os/createthread.o"
include "$(BUILD_DIR)/src/libultra/os/setsr.o"
include "$(BUILD_DIR)/src/libultra/os/getsr.o"
include "$(BUILD_DIR)/src/libultra/os/writebackdcache.o"
include "$(BUILD_DIR)/src/libultra/io/vigetnextframebuf.o"
include "$(BUILD_DIR)/src/libultra/io/pimgr.o"
include "$(BUILD_DIR)/src/libultra/io/devmgr.o"
include "$(BUILD_DIR)/src/libultra/io/pirawdma.o"
include "$(BUILD_DIR)/src/libultra/os/virtualtophysical.o"
include "$(BUILD_DIR)/src/libultra/io/viblack.o"
include "$(BUILD_DIR)/src/libultra/io/sirawread.o"
include "$(BUILD_DIR)/src/libultra/os/getthreadid.o"
include "$(BUILD_DIR)/src/libultra/os/setintmask.o"
include "$(BUILD_DIR)/src/libultra/io/visetmode.o"
include "$(BUILD_DIR)/src/libultra/os/probetlb.o"
include "$(BUILD_DIR)/src/libultra/os/getmemsize.o"
include "$(BUILD_DIR)/src/libultra/os/seteventmesg.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/libc/xprintf.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/unmaptlball.o"
include "$(BUILD_DIR)/src/libultra/io/epidma.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/libc/string.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/invalicache.o"
include "$(BUILD_DIR)/src/libultra/os/createmesgqueue.o"
include "$(BUILD_DIR)/src/libultra/os/invaldcache.o"
include "$(BUILD_DIR)/src/libultra/io/si.o"
include "$(BUILD_DIR)/src/libultra/os/jammesg.o"
include "$(BUILD_DIR)/src/libultra/os/setthreadpri.o"
include "$(BUILD_DIR)/src/libultra/os/getthreadpri.o"
include "$(BUILD_DIR)/src/libultra/io/epirawread.o"
include "$(BUILD_DIR)/src/libultra/io/viswapbuf.o"
include "$(BUILD_DIR)/src/libultra/io/epirawdma.o"
include "$(BUILD_DIR)/src/libultra/libc/bcmp.o"
include "$(BUILD_DIR)/src/libultra/os/gettime.o"
include "$(BUILD_DIR)/src/libultra/os/timerintr.o"
include "$(BUILD_DIR)/src/libultra/os/getcount.o"
include "$(BUILD_DIR)/src/libultra/os/setglobalintmask.o"
include "$(BUILD_DIR)/src/libultra/os/setcompare.o"
include "$(BUILD_DIR)/src/libultra/libc/bcopy.o"
include "$(BUILD_DIR)/src/libultra/os/resetglobalintmask.o"
include "$(BUILD_DIR)/src/libultra/os/interrupt.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallan1.o"
include "$(BUILD_DIR)/src/libultra/io/vi.o"
include "$(BUILD_DIR)/src/libultra/io/viswapcontext.o"
include "$(BUILD_DIR)/src/libultra/io/pigetcmdq.o"
include "$(BUILD_DIR)/src/libultra/io/epiread.o"
include "$(BUILD_DIR)/src/libultra/io/visetspecial.o"
include "$(BUILD_DIR)/src/libultra/io/cartrominit.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/vimodefpallan1.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/setfpccsr.o"
include "$(BUILD_DIR)/src/libultra/os/getfpccsr.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/epiwrite.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/maptlbrdb.o"
include "$(BUILD_DIR)/src/libultra/os/yieldthread.o"
include "$(BUILD_DIR)/src/libultra/os/getcause.o"
include "$(BUILD_DIR)/src/libultra/io/epirawwrite.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/libc/xlitob.o"
include "$(BUILD_DIR)/src/libultra/libc/ldiv.o"
include "$(BUILD_DIR)/src/libultra/libc/xldtob.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/sirawwrite.o"
include "$(BUILD_DIR)/src/libultra/io/vimgr.o"
include "$(BUILD_DIR)/src/libultra/io/vigetcurrcontext.o"
include "$(BUILD_DIR)/src/libultra/os/startthread.o"
include "$(BUILD_DIR)/src/libultra/io/visetyscale.o"
include "$(BUILD_DIR)/src/libultra/io/visetxscale.o"
include "$(BUILD_DIR)/src/libultra/os/sethwintrroutine.o"
include "$(BUILD_DIR)/src/libultra/os/gethwintrroutine.o"
include "$(BUILD_DIR)/src/libultra/os/setwatchlo.o"

View file

@ -0,0 +1,72 @@
include "$(BUILD_DIR)/src/libultra/os/invaldcache.o"
include "$(BUILD_DIR)/src/libultra/os/invalicache.o"
include "$(BUILD_DIR)/src/libultra/libc/bcmp.o"
include "$(BUILD_DIR)/src/libultra/libc/bzero.o"
include "$(BUILD_DIR)/src/libultra/os/createmesgqueue.o"
include "$(BUILD_DIR)/src/libultra/os/recvmesg.o"
include "$(BUILD_DIR)/src/libultra/os/sendmesg.o"
include "$(BUILD_DIR)/src/libultra/os/getfpccsr.o"
include "$(BUILD_DIR)/src/libultra/os/getsr.o"
include "$(BUILD_DIR)/src/libultra/os/setfpccsr.o"
include "$(BUILD_DIR)/src/libultra/os/setsr.o"
include "$(BUILD_DIR)/src/libultra/os/createthread.o"
include "$(BUILD_DIR)/src/libultra/os/setthreadpri.o"
include "$(BUILD_DIR)/src/libultra/os/startthread.o"
include "$(BUILD_DIR)/src/libultra/os/stopthread.o"
include "$(BUILD_DIR)/src/libultra/os/thread.o"
include "$(BUILD_DIR)/src/libultra/os/gettime.o"
include "$(BUILD_DIR)/src/libultra/os/timerintr.o"
include "$(BUILD_DIR)/src/libultra/io/vigetnextframebuf.o"
include "$(BUILD_DIR)/src/libultra/io/vimgr.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallan1.o"
include "$(BUILD_DIR)/src/libultra/io/visetmode.o"
include "$(BUILD_DIR)/src/libultra/io/visetspecial.o"
include "$(BUILD_DIR)/src/libultra/io/visetxscale.o"
include "$(BUILD_DIR)/src/libultra/io/visetyscale.o"
include "$(BUILD_DIR)/src/libultra/io/viswapbuf.o"
include "$(BUILD_DIR)/src/libultra/io/viswapcontext.o"
include "$(BUILD_DIR)/src/libultra/io/viblack.o"
include "$(BUILD_DIR)/src/libultra/io/viextendvstart.o"
include "$(BUILD_DIR)/src/libultra/os/exceptasm.o"
include "$(BUILD_DIR)/src/libultra/os/interrupt.o"
include "$(BUILD_DIR)/src/libultra/os/setintmask.o"
include "$(BUILD_DIR)/src/libultra/os/sethwintrroutine.o"
include "$(BUILD_DIR)/src/libultra/os/gethwintrroutine.o"
include "$(BUILD_DIR)/src/libultra/io/pimgr.o"
include "$(BUILD_DIR)/src/libultra/io/epirawdma.o"
include "$(BUILD_DIR)/src/libultra/io/epiread.o"
include "$(BUILD_DIR)/src/libultra/io/epidma.o"
include "$(BUILD_DIR)/src/libultra/io/cartrominit.o"
include "$(BUILD_DIR)/src/libultra/io/devmgr.o"
include "$(BUILD_DIR)/src/libultra/io/piacs.o"
include "$(BUILD_DIR)/src/libultra/os/parameters.o"
include "$(BUILD_DIR)/src/libultra/os/getmemsize.o"
include "$(BUILD_DIR)/src/libultra/os/initialize.o"
include "$(BUILD_DIR)/src/libultra/os/writebackdcache.o"
include "$(BUILD_DIR)/src/libultra/os/virtualtophysical.o"
include "$(BUILD_DIR)/src/libultra/libc/bcopy.o"
include "$(BUILD_DIR)/src/libultra/os/jammesg.o"
include "$(BUILD_DIR)/src/libultra/os/seteventmesg.o"
include "$(BUILD_DIR)/src/libultra/os/getcause.o"
include "$(BUILD_DIR)/src/libultra/os/setwatchlo.o"
include "$(BUILD_DIR)/src/libultra/reg/_getcount.o"
include "$(BUILD_DIR)/src/libultra/reg/_setcompare.o"
include "$(BUILD_DIR)/src/libultra/io/sirawread.o"
include "$(BUILD_DIR)/src/libultra/io/sirawwrite.o"
include "$(BUILD_DIR)/src/libultra/os/destroythread.o"
include "$(BUILD_DIR)/src/libultra/os/getthreadpri.o"
include "$(BUILD_DIR)/src/libultra/os/yieldthread.o"
include "$(BUILD_DIR)/src/libultra/os/probetlb.o"
include "$(BUILD_DIR)/src/libultra/os/maptlbrdb.o"
include "$(BUILD_DIR)/src/libultra/os/unmaptlball.o"
include "$(BUILD_DIR)/src/libultra/io/vi.o"
include "$(BUILD_DIR)/src/libultra/io/vigetcurrcontext.o"
include "$(BUILD_DIR)/src/libultra/os/setglobalintmask.o"
include "$(BUILD_DIR)/src/libultra/os/resetglobalintmask.o"
include "$(BUILD_DIR)/src/libultra/io/pirawdma.o"
include "$(BUILD_DIR)/src/libultra/io/pigetcmdq.o"
include "$(BUILD_DIR)/src/libultra/io/epirawread.o"
include "$(BUILD_DIR)/src/libultra/io/epirawwrite.o"
include "$(BUILD_DIR)/src/libultra/io/si.o"

View file

@ -0,0 +1,94 @@
include "$(BUILD_DIR)/src/libultra/io/piacs.o"
include "$(BUILD_DIR)/src/libultra/os/sendmesg.o"
include "$(BUILD_DIR)/src/libultra/os/stopthread.o"
#if OOT_VERSION >= PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/viextendvstart.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallan1.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/recvmesg.o"
include "$(BUILD_DIR)/src/libultra/libc/ll.o"
include "$(BUILD_DIR)/src/libultra/os/exceptasm.o"
include "$(BUILD_DIR)/src/libultra/os/thread.o"
include "$(BUILD_DIR)/src/libultra/os/destroythread.o"
include "$(BUILD_DIR)/src/libultra/libc/bzero.o"
include "$(BUILD_DIR)/src/libultra/os/createthread.o"
include "$(BUILD_DIR)/src/libultra/os/initialize.o"
include "$(BUILD_DIR)/src/libultra/os/parameters.o"
include "$(BUILD_DIR)/src/libultra/os/setsr.o"
include "$(BUILD_DIR)/src/libultra/os/getsr.o"
include "$(BUILD_DIR)/src/libultra/os/writebackdcache.o"
include "$(BUILD_DIR)/src/libultra/io/vigetnextframebuf.o"
include "$(BUILD_DIR)/src/libultra/io/pimgr.o"
include "$(BUILD_DIR)/src/libultra/io/devmgr.o"
include "$(BUILD_DIR)/src/libultra/io/pirawdma.o"
include "$(BUILD_DIR)/src/libultra/os/virtualtophysical.o"
include "$(BUILD_DIR)/src/libultra/io/viblack.o"
include "$(BUILD_DIR)/src/libultra/io/sirawread.o"
include "$(BUILD_DIR)/src/libultra/os/getthreadid.o"
include "$(BUILD_DIR)/src/libultra/os/setintmask.o"
include "$(BUILD_DIR)/src/libultra/io/visetmode.o"
include "$(BUILD_DIR)/src/libultra/os/probetlb.o"
include "$(BUILD_DIR)/src/libultra/os/getmemsize.o"
include "$(BUILD_DIR)/src/libultra/os/seteventmesg.o"
include "$(BUILD_DIR)/src/libultra/os/unmaptlball.o"
include "$(BUILD_DIR)/src/libultra/io/epidma.o"
include "$(BUILD_DIR)/src/libultra/os/invalicache.o"
include "$(BUILD_DIR)/src/libultra/os/createmesgqueue.o"
include "$(BUILD_DIR)/src/libultra/os/invaldcache.o"
include "$(BUILD_DIR)/src/libultra/io/si.o"
include "$(BUILD_DIR)/src/libultra/os/jammesg.o"
include "$(BUILD_DIR)/src/libultra/os/setthreadpri.o"
include "$(BUILD_DIR)/src/libultra/os/getthreadpri.o"
include "$(BUILD_DIR)/src/libultra/io/epirawread.o"
#if OOT_VERSION >= PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/viswapbuf.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/epirawdma.o"
include "$(BUILD_DIR)/src/libultra/os/gettime.o"
include "$(BUILD_DIR)/src/libultra/os/timerintr.o"
include "$(BUILD_DIR)/src/libultra/os/getcount.o"
include "$(BUILD_DIR)/src/libultra/os/setglobalintmask.o"
include "$(BUILD_DIR)/src/libultra/os/setcompare.o"
include "$(BUILD_DIR)/src/libultra/libc/bcopy.o"
include "$(BUILD_DIR)/src/libultra/os/resetglobalintmask.o"
include "$(BUILD_DIR)/src/libultra/os/interrupt.o"
#if OOT_NTSC
include "$(BUILD_DIR)/src/libultra/io/vimodentsclan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallan1.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/vi.o"
#if OOT_PAL
include "$(BUILD_DIR)/src/libultra/io/vimodentsclan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallan1.o"
#endif
#if OOT_VERSION < PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/vimodepallan1.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/viswapcontext.o"
include "$(BUILD_DIR)/src/libultra/io/pigetcmdq.o"
include "$(BUILD_DIR)/src/libultra/io/epiread.o"
#if OOT_VERSION >= PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/visetspecial.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/cartrominit.o"
#if OOT_PAL
include "$(BUILD_DIR)/src/libultra/io/vimodefpallan1.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/setfpccsr.o"
include "$(BUILD_DIR)/src/libultra/os/getfpccsr.o"
include "$(BUILD_DIR)/src/libultra/io/epiwrite.o"
include "$(BUILD_DIR)/src/libultra/os/maptlbrdb.o"
include "$(BUILD_DIR)/src/libultra/os/yieldthread.o"
include "$(BUILD_DIR)/src/libultra/os/getcause.o"
include "$(BUILD_DIR)/src/libultra/io/epirawwrite.o"
include "$(BUILD_DIR)/src/libultra/os/settimer.o"
include "$(BUILD_DIR)/src/libultra/io/sirawwrite.o"
include "$(BUILD_DIR)/src/libultra/io/vimgr.o"
include "$(BUILD_DIR)/src/libultra/io/vigetcurrcontext.o"
include "$(BUILD_DIR)/src/libultra/os/startthread.o"
#if OOT_VERSION >= PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/visetyscale.o"
include "$(BUILD_DIR)/src/libultra/io/visetxscale.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/sethwintrroutine.o"
include "$(BUILD_DIR)/src/libultra/os/gethwintrroutine.o"

View file

@ -0,0 +1,95 @@
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/pfsfreeblocks.o"
#endif
include "$(BUILD_DIR)/src/libultra/mgu/scale.o"
include "$(BUILD_DIR)/src/libultra/gu/sinf.o"
include "$(BUILD_DIR)/src/libultra/gu/sins.o"
include "$(BUILD_DIR)/src/libultra/io/sptask.o"
include "$(BUILD_DIR)/src/libultra/io/motor.o"
include "$(BUILD_DIR)/src/libultra/io/siacs.o"
include "$(BUILD_DIR)/src/libultra/io/controller.o"
include "$(BUILD_DIR)/src/libultra/io/contreaddata.o"
include "$(BUILD_DIR)/src/libultra/gu/perspective.o"
include "$(BUILD_DIR)/src/libultra/io/sprawdma.o"
include "$(BUILD_DIR)/src/libultra/io/sirawdma.o"
include "$(BUILD_DIR)/src/libultra/io/sptaskyield.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/pfsreadwritefile.o"
include "$(BUILD_DIR)/src/libultra/io/pfsgetstatus.o"
#endif
include "$(BUILD_DIR)/src/libultra/mgu/mtxidentf.o"
include "$(BUILD_DIR)/src/libultra/gu/lookat.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/pfsallocatefile.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/stoptimer.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/contpfs.o"
include "$(BUILD_DIR)/src/libultra/mgu/mtxl2f.o"
include "$(BUILD_DIR)/src/libultra/io/pfsfindfile.o"
#endif
include "$(BUILD_DIR)/src/libultra/gu/sqrtf.o"
include "$(BUILD_DIR)/src/libultra/os/afterprenmi.o"
include "$(BUILD_DIR)/src/libultra/io/contquery.o"
include "$(BUILD_DIR)/src/libultra/gu/lookathil.o"
#if !DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/libc/xprintf.o"
include "$(BUILD_DIR)/src/libultra/libc/string.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/sp.o"
include "$(BUILD_DIR)/src/libultra/mgu/mtxident.o"
include "$(BUILD_DIR)/src/libultra/gu/position.o"
include "$(BUILD_DIR)/src/libultra/io/sptaskyielded.o"
include "$(BUILD_DIR)/src/libultra/gu/rotate.o"
include "$(BUILD_DIR)/src/libultra/io/aisetfreq.o"
include "$(BUILD_DIR)/src/libultra/os/getactivequeue.o"
include "$(BUILD_DIR)/src/libultra/mgu/normalize.o"
include "$(BUILD_DIR)/src/libultra/io/dpgetstat.o"
include "$(BUILD_DIR)/src/libultra/io/dpsetstat.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/pfsdeletefile.o"
#endif
include "$(BUILD_DIR)/src/libultra/gu/ortho.o"
include "$(BUILD_DIR)/src/libultra/gu/cosf.o"
include "$(BUILD_DIR)/src/libultra/gu/libm_vals.o"
include "$(BUILD_DIR)/src/libultra/gu/coss.o"
include "$(BUILD_DIR)/src/libultra/io/visetevent.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/pfsisplug.o"
#endif
include "$(BUILD_DIR)/src/libultra/gu/us2dex.o"
include "$(BUILD_DIR)/src/libultra/io/pfsselectbank.o"
include "$(BUILD_DIR)/src/libultra/io/contsetch.o"
#if DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/pfsfilestate.o"
include "$(BUILD_DIR)/src/libultra/io/pfsinitpak.o"
include "$(BUILD_DIR)/src/libultra/io/pfschecker.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/aigetlen.o"
include "$(BUILD_DIR)/src/libultra/mgu/translate.o"
include "$(BUILD_DIR)/src/libultra/io/contramwrite.o"
#if !DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/vimodefpallan1.o"
include "$(BUILD_DIR)/src/libultra/io/pfsgetstatus.o"
include "$(BUILD_DIR)/src/libultra/io/contpfs.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/contramread.o"
include "$(BUILD_DIR)/src/libultra/io/crc.o"
#if !DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/io/pfsisplug.o"
#endif
include "$(BUILD_DIR)/src/libultra/os/settimer.o"
#if !DEBUG_FEATURES
include "$(BUILD_DIR)/src/libultra/libc/xldtob.o"
include "$(BUILD_DIR)/src/libultra/libc/ldiv.o"
include "$(BUILD_DIR)/src/libultra/libc/xlitob.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/spgetstat.o"
include "$(BUILD_DIR)/src/libultra/io/spsetstat.o"
include "$(BUILD_DIR)/src/libultra/os/writebackdcacheall.o"
include "$(BUILD_DIR)/src/libultra/os/getcurrfaultedthread.o"
include "$(BUILD_DIR)/src/libultra/mgu/mtxf2l.o"
include "$(BUILD_DIR)/src/libultra/libc/llcvt.o"
include "$(BUILD_DIR)/src/libultra/io/vigetcurrframebuf.o"
include "$(BUILD_DIR)/src/libultra/io/spsetpc.o"
include "$(BUILD_DIR)/src/libc/sqrt.o"

View file

@ -0,0 +1,125 @@
include "$(BUILD_DIR)/src/libultra/io/aigetlen.o"
include "$(BUILD_DIR)/src/libultra/io/aisetfreq.o"
include "$(BUILD_DIR)/src/libultra/audio/sl.o"
include "$(BUILD_DIR)/src/libultra/audio/synthesizer.o"
include "$(BUILD_DIR)/src/libultra/audio/syndelete.o"
include "$(BUILD_DIR)/src/libultra/audio/synallocfx.o"
include "$(BUILD_DIR)/src/libultra/os/writebackdcacheall.o"
include "$(BUILD_DIR)/src/libultra/io/contquery.o"
include "$(BUILD_DIR)/src/libultra/io/contreaddata.o"
include "$(BUILD_DIR)/src/libultra/io/controller.o"
include "$(BUILD_DIR)/src/libultra/io/contsetch.o"
include "$(BUILD_DIR)/src/libultra/gu/sqrtf.o"
include "$(BUILD_DIR)/src/libultra/gu/cosf.o"
include "$(BUILD_DIR)/src/libultra/gu/coss.o"
include "$(BUILD_DIR)/src/libultra/gu/lookat.o"
include "$(BUILD_DIR)/src/libultra/gu/lookathil.o"
include "$(BUILD_DIR)/src/libultra/gu/ortho.o"
include "$(BUILD_DIR)/src/libultra/gu/perspective.o"
include "$(BUILD_DIR)/src/libultra/gu/position.o"
include "$(BUILD_DIR)/src/libultra/gu/sinf.o"
include "$(BUILD_DIR)/src/libultra/gu/sins.o"
include "$(BUILD_DIR)/src/libultra/gu/us2dex.o"
include "$(BUILD_DIR)/src/libultra/libc/ll.o"
include "$(BUILD_DIR)/src/libultra/libc/llcvt.o"
include "$(BUILD_DIR)/src/libultra/libc/string.o"
include "$(BUILD_DIR)/src/libultra/libc/xprintf.o"
include "$(BUILD_DIR)/src/libultra/io/dpgetstat.o"
include "$(BUILD_DIR)/src/libultra/io/dpsetstat.o"
include "$(BUILD_DIR)/src/libultra/io/spgetstat.o"
include "$(BUILD_DIR)/src/libultra/io/spsetstat.o"
include "$(BUILD_DIR)/src/libultra/io/sptask.o"
include "$(BUILD_DIR)/src/libultra/io/sptaskyield.o"
include "$(BUILD_DIR)/src/libultra/io/sptaskyielded.o"
include "$(BUILD_DIR)/src/libultra/io/sirawdma.o"
include "$(BUILD_DIR)/src/libultra/io/siacs.o"
include "$(BUILD_DIR)/src/libultra/os/getthreadid.o"
include "$(BUILD_DIR)/src/libultra/os/getactivequeue.o"
include "$(BUILD_DIR)/src/libultra/os/settimer.o"
include "$(BUILD_DIR)/src/libultra/os/stoptimer.o"
include "$(BUILD_DIR)/src/libultra/io/vigetcurrframebuf.o"
include "$(BUILD_DIR)/src/libultra/io/visetevent.o"
include "$(BUILD_DIR)/src/libultra/io/vitbl.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclpf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclan2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentsclaf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentschpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentschpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentschan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentschaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentschpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodentschpf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallpf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallan2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepallaf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepalhpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepalhpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepalhan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepalhaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepalhpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodepalhpf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallpf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallan2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempallaf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempalhpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempalhpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempalhan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempalhaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempalhpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodempalhpf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallpf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallan2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpallaf2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpalhpn1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpalhpf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpalhan1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpalhaf1.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpalhpn2.o"
include "$(BUILD_DIR)/src/libultra/io/vimodefpalhpf2.o"
include "$(BUILD_DIR)/src/libultra/mgu/mtxident.o"
include "$(BUILD_DIR)/src/libultra/mgu/mtxidentf.o"
include "$(BUILD_DIR)/src/libultra/mgu/mtxf2l.o"
include "$(BUILD_DIR)/src/libultra/mgu/scale.o"
include "$(BUILD_DIR)/src/libultra/mgu/translate.o"
include "$(BUILD_DIR)/src/libultra/gu/rotate.o"
include "$(BUILD_DIR)/src/libultra/os/getcurrfaultedthread.o"
include "$(BUILD_DIR)/src/libultra/bb/sk/skapi.o"
include "$(BUILD_DIR)/src/libultra/bb/sa/common.o"
include "$(BUILD_DIR)/src/libultra/io/motor.o"
include "$(BUILD_DIR)/src/libultra/os/afterprenmi.o"
include "$(BUILD_DIR)/src/libultra/audio/drvrnew.o"
include "$(BUILD_DIR)/src/libultra/audio/load.o"
include "$(BUILD_DIR)/src/libultra/audio/auxbus.o"
include "$(BUILD_DIR)/src/libultra/audio/env.o"
include "$(BUILD_DIR)/src/libultra/audio/filter.o"
include "$(BUILD_DIR)/src/libultra/audio/mainbus.o"
include "$(BUILD_DIR)/src/libultra/audio/resample.o"
include "$(BUILD_DIR)/src/libultra/audio/reverb.o"
include "$(BUILD_DIR)/src/libultra/audio/save.o"
include "$(BUILD_DIR)/src/libultra/audio/heapalloc.o"
include "$(BUILD_DIR)/src/libultra/audio/copy.o"
include "$(BUILD_DIR)/src/libultra/gu/libm_vals.o"
include "$(BUILD_DIR)/src/libultra/libc/xlitob.o"
include "$(BUILD_DIR)/src/libultra/libc/xldtob.o"
include "$(BUILD_DIR)/src/libultra/io/sp.o"
include "$(BUILD_DIR)/src/libultra/io/spsetpc.o"
include "$(BUILD_DIR)/src/libultra/io/sprawdma.o"
include "$(BUILD_DIR)/src/libultra/mgu/normalize.o"
include "$(BUILD_DIR)/src/libultra/libc/ldiv.o"

View file

@ -0,0 +1,72 @@
include "$(BUILD_DIR)/src/libultra/os/getintmask.o"
include "$(BUILD_DIR)/src/libultra/gu/scale.o"
include "$(BUILD_DIR)/src/libultra/gu/sinf.o"
include "$(BUILD_DIR)/src/libultra/gu/sins.o"
include "$(BUILD_DIR)/src/libultra/io/sptask.o"
include "$(BUILD_DIR)/src/libultra/io/motor.o"
include "$(BUILD_DIR)/src/libultra/io/siacs.o"
include "$(BUILD_DIR)/src/libultra/io/controller.o"
include "$(BUILD_DIR)/src/libultra/io/contreaddata.o"
include "$(BUILD_DIR)/src/libultra/gu/perspective.o"
include "$(BUILD_DIR)/src/libultra/io/sprawdma.o"
include "$(BUILD_DIR)/src/libultra/io/sirawdma.o"
include "$(BUILD_DIR)/src/libultra/io/sptaskyield.o"
include "$(BUILD_DIR)/src/libultra/gu/mtxutil.o"
include "$(BUILD_DIR)/src/libultra/gu/lookat.o"
include "$(BUILD_DIR)/src/libultra/os/stoptimer.o"
include "$(BUILD_DIR)/src/libultra/gu/sqrtf.o"
include "$(BUILD_DIR)/src/libultra/os/afterprenmi.o"
include "$(BUILD_DIR)/src/libultra/io/contquery.o"
include "$(BUILD_DIR)/src/libultra/gu/lookathil.o"
include "$(BUILD_DIR)/src/libultra/libc/xprintf.o"
include "$(BUILD_DIR)/src/libultra/libc/string.o"
include "$(BUILD_DIR)/src/libultra/io/sp.o"
#if OOT_VERSION < PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/viswapbuf.o"
#endif
include "$(BUILD_DIR)/src/libultra/gu/position.o"
include "$(BUILD_DIR)/src/libultra/io/sptaskyielded.o"
include "$(BUILD_DIR)/src/libultra/gu/rotate.o"
include "$(BUILD_DIR)/src/libultra/io/aisetfreq.o"
include "$(BUILD_DIR)/src/libultra/os/getactivequeue.o"
include "$(BUILD_DIR)/src/libultra/gu/normalize.o"
include "$(BUILD_DIR)/src/libultra/io/dpgetstat.o"
include "$(BUILD_DIR)/src/libultra/io/dpsetstat.o"
include "$(BUILD_DIR)/src/libultra/gu/ortho.o"
include "$(BUILD_DIR)/src/libultra/gu/cosf.o"
include "$(BUILD_DIR)/src/libultra/gu/libm_vals.o"
#if OOT_VERSION < PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/visetspecial.o"
#endif
include "$(BUILD_DIR)/src/libultra/gu/coss.o"
include "$(BUILD_DIR)/src/libultra/os/settime.o"
include "$(BUILD_DIR)/src/libultra/io/visetevent.o"
include "$(BUILD_DIR)/src/libultra/gu/us2dex.o"
include "$(BUILD_DIR)/src/libultra/io/pfsselectbank.o"
include "$(BUILD_DIR)/src/libultra/io/contsetch.o"
include "$(BUILD_DIR)/src/libultra/io/aigetlen.o"
include "$(BUILD_DIR)/src/libultra/gu/translate.o"
include "$(BUILD_DIR)/src/libultra/io/contramwrite.o"
#if OOT_VERSION == NTSC_1_2
include "$(BUILD_DIR)/src/libultra/io/vimodefpallan1.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/pfsgetstatus.o"
include "$(BUILD_DIR)/src/libultra/io/contpfs.o"
include "$(BUILD_DIR)/src/libultra/libc/bcmp.o"
include "$(BUILD_DIR)/src/libultra/io/contramread.o"
include "$(BUILD_DIR)/src/libultra/io/crc.o"
include "$(BUILD_DIR)/src/libultra/io/pfsisplug.o"
include "$(BUILD_DIR)/src/libultra/libc/xlitob.o"
include "$(BUILD_DIR)/src/libultra/libc/ldiv.o"
include "$(BUILD_DIR)/src/libultra/libc/xldtob.o"
include "$(BUILD_DIR)/src/libultra/io/spgetstat.o"
include "$(BUILD_DIR)/src/libultra/io/spsetstat.o"
include "$(BUILD_DIR)/src/libultra/os/writebackdcacheall.o"
include "$(BUILD_DIR)/src/libultra/os/getcurrfaultedthread.o"
include "$(BUILD_DIR)/src/libultra/libc/llcvt.o"
#if OOT_VERSION < PAL_1_0
include "$(BUILD_DIR)/src/libultra/io/visetyscale.o"
#endif
include "$(BUILD_DIR)/src/libultra/io/vigetcurrframebuf.o"
include "$(BUILD_DIR)/src/libultra/io/spsetpc.o"
include "$(BUILD_DIR)/src/libc/sqrt.o"

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

3911
spec_includes/scenes_n64.inc Normal file

File diff suppressed because it is too large Load diff

View file

@ -1 +0,0 @@

View file

@ -1 +1,42 @@
#include "libc/stddef.h"
int strcmp(const char* s, const char* t) {
while (*s == *t) {
if (*s == '\0') {
return 0;
}
s++;
t++;
}
return *s - *t;
}
void* memset(char* s, int c, size_t n) {
size_t i;
for (i = 0; i < n; i++) {
s[i] = c;
}
return s;
}
int strncmp(const char* s, const char* t, int n) {
int i;
for (i = 0; (*s == *t) && (i < n); i++) {
if (*s == '\0') {
if (*t == '\0') {
return 0;
}
break;
}
if (*t == '\0') {
break;
}
s++;
t++;
}
return (i != n) ? *s - *t : 0;
}

View file

@ -2,9 +2,12 @@
#define MOTOR_ID 0x80 #define MOTOR_ID 0x80
#ifndef BBPLAYER
OSPifRam __MotorDataBuf[MAXCONTROLLERS]; OSPifRam __MotorDataBuf[MAXCONTROLLERS];
#endif
s32 __osMotorAccess(OSPfs* pfs, s32 vibrate) { s32 __osMotorAccess(OSPfs* pfs, s32 vibrate) {
#ifndef BBPLAYER
s32 i; s32 i;
s32 ret; s32 ret;
u8* ptr = (u8*)&__MotorDataBuf[pfs->channel]; u8* ptr = (u8*)&__MotorDataBuf[pfs->channel];
@ -43,8 +46,12 @@ s32 __osMotorAccess(OSPfs* pfs, s32 vibrate) {
__osSiRelAccess(); __osSiRelAccess();
return ret; return ret;
#else
return PFS_ERR_INVALID;
#endif
} }
#ifndef BBPLAYER
void _MakeMotorData(s32 channel, OSPifRam* mdata) { void _MakeMotorData(s32 channel, OSPifRam* mdata) {
u8* ptr = (u8*)mdata; u8* ptr = (u8*)mdata;
__OSContRamReadFormat ramreadformat; __OSContRamReadFormat ramreadformat;
@ -67,8 +74,10 @@ void _MakeMotorData(s32 channel, OSPifRam* mdata) {
ptr += sizeof(ramreadformat); ptr += sizeof(ramreadformat);
*ptr = CONT_CMD_END; *ptr = CONT_CMD_END;
} }
#endif
s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel) { s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel) {
#ifndef BBPLAYER
s32 ret; s32 ret;
u8 temp[BLOCKSIZE]; u8 temp[BLOCKSIZE];
@ -123,4 +132,7 @@ s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel) {
pfs->status = PFS_MOTOR_INITIALIZED; pfs->status = PFS_MOTOR_INITIALIZED;
return 0; // "Recognized rumble pak" return 0; // "Recognized rumble pak"
#else
return PFS_ERR_INVALID;
#endif
} }

View file

@ -41,7 +41,7 @@ IPL_SYMBOL(__osBbStateName, 0x800003A4, 0x10)
IPL_SYMBOL(__osBbStateDirty, 0x800003B4, 4) IPL_SYMBOL(__osBbStateDirty, 0x800003B4, 4)
IPL_SYMBOL(__osBbAuxDataLimit, 0x800003B8, 4) IPL_SYMBOL(__osBbAuxDataLimit, 0x800003B8, 4)
.space 0x30 .space 0x10
#endif #endif