From f27e4cf53bef2de66768a61b658395f52a547870 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Fri, 19 Jul 2024 09:19:09 -0700 Subject: [PATCH] Move copied libultra archive to the libultra build folder (#47) * Combine makefile defines to avoid duplication * Move copied libultra archive to the libultra build folder --- Makefile | 16 +-- tools/progress.py | 3 - yamls/us/main.yaml | 352 ++++++++++++++++++++++----------------------- 3 files changed, 184 insertions(+), 187 deletions(-) diff --git a/Makefile b/Makefile index 3e07702..51fcaad 100644 --- a/Makefile +++ b/Makefile @@ -153,12 +153,12 @@ CFLAGS += -G 0 -non_shared -Xcpluscomm -nostdinc -Wab,-r4300_mul WARNINGS := -fullwarn -verbose -woff 624,649,838,712,516,513,596,564,594 ASFLAGS := -march=vr4300 -32 -G0 -COMMON_DEFINES := -D_MIPS_SZLONG=32 GBI_DEFINES := -DF3DEX_GBI RELEASE_DEFINES := -DNDEBUG -D_FINALROM -AS_DEFINES := -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_ULTRA64 -C_DEFINES := -DLANGUAGE_C -D_LANGUAGE_C LIBULTRA_DEFINES := -DBUILD_VERSION=VERSION_$(ULTRALIB_VERSION) +COMMON_DEFINES := -D_MIPS_SZLONG=32 $(GBI_DEFINES) $(RELEASE_DEFINES) $(LIBULTRA_DEFINES) +AS_DEFINES := -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_ULTRA64 $(COMMON_DEFINES) +C_DEFINES := -DLANGUAGE_C -D_LANGUAGE_C $(COMMON_DEFINES) ENDIAN := -EB OPTFLAGS := -O2 -g3 @@ -171,7 +171,7 @@ OBJDUMP_FLAGS := --disassemble --reloc --disassemble-zeroes -Mreg-names=32 -Mno- ifneq ($(OBJDUMP_BUILD), 0) OBJDUMP_CMD = $(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) OBJCOPY_BIN = $(OBJCOPY) -O binary $@ $@.bin - LIBDUMP_CMD = $(AR) xo --output $(@:.a=) $@ + LIBDUMP_CMD = $(AR) xo --output $(@D) $@ else OBJDUMP_CMD = @: OBJCOPY_BIN = @: @@ -190,12 +190,12 @@ $(shell mkdir -p asm/$(VERSION) assets/$(VERSION) linker_scripts/$(VERSION)/auto ULTRALIB_DIR := lib/ultralib ULTRALIB_LIB := $(ULTRALIB_DIR)/build/$(ULTRALIB_VERSION)/$(ULTRALIB_TARGET)/$(ULTRALIB_TARGET).a LIBULTRA_DIR := lib/libultra -LIBULTRA_LIB := $(BUILD_DIR)/$(LIBULTRA_DIR).a +LIBULTRA_LIB := $(BUILD_DIR)/$(LIBULTRA_DIR)/libultra.a SRC_DIRS := $(shell find src -type d) ASM_DIRS := $(shell find asm/$(VERSION) -type d -not -path "asm/$(VERSION)/nonmatchings/*") BIN_DIRS := $(shell find assets/$(VERSION) -type d) -LIB_DIRS := $(foreach f, $(LIBULTRA_DIR), $f) +LIB_DIRS := $(foreach f,$(LIBULTRA_DIR),$f) C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) S_FILES := $(foreach dir,$(ASM_DIRS) $(SRC_DIRS),$(wildcard $(dir)/*.s)) @@ -318,8 +318,8 @@ $(BUILD_DIR)/%.o: %.s $(OBJDUMP_CMD) $(BUILD_DIR)/%.o: %.c - $(CC_CHECK) $(CC_CHECK_FLAGS) $(IINC) -I $(dir $*) $(CHECK_WARNINGS) $(BUILD_DEFINES) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(LIBULTRA_DEFINES) $(C_DEFINES) $(MIPS_BUILTIN_DEFS) -o $@ $< - $(CC) -c $(CFLAGS) $(BUILD_DEFINES) $(IINC) $(WARNINGS) $(MIPS_VERSION) $(ENDIAN) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(LIBULTRA_DEFINES) $(C_DEFINES) $(OPTFLAGS) -o $@ $< + $(CC_CHECK) $(CC_CHECK_FLAGS) $(IINC) -I $(dir $*) $(CHECK_WARNINGS) $(BUILD_DEFINES) $(C_DEFINES) $(MIPS_BUILTIN_DEFS) -o $@ $< + $(CC) -c $(CFLAGS) $(BUILD_DEFINES) $(IINC) $(WARNINGS) $(MIPS_VERSION) $(ENDIAN) $(C_DEFINES) $(OPTFLAGS) -o $@ $< $(OBJDUMP_CMD) $(RM_MDEBUG) diff --git a/tools/progress.py b/tools/progress.py index d74c9d9..b7b6be7 100755 --- a/tools/progress.py +++ b/tools/progress.py @@ -29,9 +29,6 @@ def getProgressFromMapFile(mapFile: mapfile_parser.MapFile, asmPath: Path, nonma else: folder = fileparts[pathIndex] - if ".a" in folder: - folder = folder.split('.a')[0] - if folder in aliases: folder = aliases[folder] diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml index f08156e..522df6f 100644 --- a/yamls/us/main.yaml +++ b/yamls/us/main.yaml @@ -103,137 +103,137 @@ # TODO: use commented out lib ones when possible # Libultra - - [0x82E10, lib, libultra, sendmesg] - - [0x82F60, lib, libultra, pfsfreeblocks] - - [0x830B0, lib, libultra, recvmesg] - - [0x831F0, lib, libultra, setintmask] - - [0x83290, lib, libultra, scale] - - [0x83330, lib, libultra, sinf] - - [0x834F0, lib, libultra, sins] - - [0x83560, asm, ../lib/ultralib/src/io/sptask] # [0x83560, lib, libultra, sptask] - - [0x83820, lib, libultra, ll] - - [0x83AE0, asm, ../lib/ultralib/src/gu/us2dex_emu] # [0x83AE0, lib, libultra, us2dex_emu] - - [0x849D0, lib, libultra, exceptasm] - - [0x852E0, lib, libultra, thread] - - [0x85320, asm, ../lib/ultralib/src/os/destroythread] # [0x85320, lib, libultra, destroythread] - - [0x85420, lib, libultra, bzero] - - [0x854C0, lib, libultra, leointerrupt] - - [0x85D40, asm, ../lib/ultralib/src/io/controller] # [0x85D40, lib, libultra, controller] - - [0x86100, lib, libultra, siacs] - - [0x861C0, asm, ../lib/ultralib/src/io/conteepwrite] # [0x861C0, lib, libultra, conteepwrite] - - [0x86710, lib, libultra, createthread] - - [0x86860, lib, libultra, contreaddata] - - [0x86A80, lib, libultra, driverominit] - - [0x86B60, lib, libultra, virtualtophysical] - - [0x86BE0, lib, libultra, writebackdcache] - - [0x86C60, lib, libultra, initialize] - - [0x86EF0, lib, libultra, pirawread] - - [0x86F50, lib, libultra, parameters] - - [0x86FB0, lib, libultra, setsr] - - [0x86FC0, lib, libultra, getsr] - - [0x86FD0, lib, libultra, perspective] - - [0x87260, lib, libultra, sprawdma] - - [0x872F0, lib, libultra, sirawdma] - - [0x873A0, lib, libultra, viblack] - - [0x87410, lib, libultra, sirawread] - - [0x87460, lib, libultra, sptaskyield] - - [0x87480, lib, libultra, getthreadid] - - [0x874A0, asm, ../lib/ultralib/src/io/pfsreadwritefile] # [0x874A0, lib, libultra, pfsreadwritefile] - - [0x879A0, asm, ../lib/ultralib/src/gu/mtxutil] # [0x879A0, lib, libultra, mtxutil] - - [0x87C10, lib, libultra, visetmode] - - [0x87C80, lib, libultra, lookat] - - [0x87FB0, lib, libultra, motor] - - [0x88750, lib, libultra, pfsallocatefile] - - [0x88F00, lib, libultra, probetlb] - - [0x88FC0, lib, libultra, getcount] - - [0x88FD0, lib, libultra, contpfs] - - [0x89D30, lib, libultra, conteepprobe] - - [0x89DD0, lib, libultra, pidma] - - [0x89EE0, lib, libultra, pfssearchfile] - - [0x8A0A0, lib, libultra, pimgr] - - [0x8A230, lib, libultra, cartrominit] - - [0x8A330, lib, libultra, piacs] + - [0x82E10, lib, libultra/libultra, sendmesg] + - [0x82F60, lib, libultra/libultra, pfsfreeblocks] + - [0x830B0, lib, libultra/libultra, recvmesg] + - [0x831F0, lib, libultra/libultra, setintmask] + - [0x83290, lib, libultra/libultra, scale] + - [0x83330, lib, libultra/libultra, sinf] + - [0x834F0, lib, libultra/libultra, sins] + - [0x83560, asm, ../lib/ultralib/src/io/sptask] # [0x83560, lib, libultra/libultra, sptask] + - [0x83820, lib, libultra/libultra, ll] + - [0x83AE0, asm, ../lib/ultralib/src/gu/us2dex_emu] # [0x83AE0, lib, libultra/libultra, us2dex_emu] + - [0x849D0, lib, libultra/libultra, exceptasm] + - [0x852E0, lib, libultra/libultra, thread] + - [0x85320, asm, ../lib/ultralib/src/os/destroythread] # [0x85320, lib, libultra/libultra, destroythread] + - [0x85420, lib, libultra/libultra, bzero] + - [0x854C0, lib, libultra/libultra, leointerrupt] + - [0x85D40, asm, ../lib/ultralib/src/io/controller] # [0x85D40, lib, libultra/libultra, controller] + - [0x86100, lib, libultra/libultra, siacs] + - [0x861C0, asm, ../lib/ultralib/src/io/conteepwrite] # [0x861C0, lib, libultra/libultra, conteepwrite] + - [0x86710, lib, libultra/libultra, createthread] + - [0x86860, lib, libultra/libultra, contreaddata] + - [0x86A80, lib, libultra/libultra, driverominit] + - [0x86B60, lib, libultra/libultra, virtualtophysical] + - [0x86BE0, lib, libultra/libultra, writebackdcache] + - [0x86C60, lib, libultra/libultra, initialize] + - [0x86EF0, lib, libultra/libultra, pirawread] + - [0x86F50, lib, libultra/libultra, parameters] + - [0x86FB0, lib, libultra/libultra, setsr] + - [0x86FC0, lib, libultra/libultra, getsr] + - [0x86FD0, lib, libultra/libultra, perspective] + - [0x87260, lib, libultra/libultra, sprawdma] + - [0x872F0, lib, libultra/libultra, sirawdma] + - [0x873A0, lib, libultra/libultra, viblack] + - [0x87410, lib, libultra/libultra, sirawread] + - [0x87460, lib, libultra/libultra, sptaskyield] + - [0x87480, lib, libultra/libultra, getthreadid] + - [0x874A0, asm, ../lib/ultralib/src/io/pfsreadwritefile] # [0x874A0, lib, libultra/libultra, pfsreadwritefile] + - [0x879A0, asm, ../lib/ultralib/src/gu/mtxutil] # [0x879A0, lib, libultra/libultra, mtxutil] + - [0x87C10, lib, libultra/libultra, visetmode] + - [0x87C80, lib, libultra/libultra, lookat] + - [0x87FB0, lib, libultra/libultra, motor] + - [0x88750, lib, libultra/libultra, pfsallocatefile] + - [0x88F00, lib, libultra/libultra, probetlb] + - [0x88FC0, lib, libultra/libultra, getcount] + - [0x88FD0, lib, libultra/libultra, contpfs] + - [0x89D30, lib, libultra/libultra, conteepprobe] + - [0x89DD0, lib, libultra/libultra, pidma] + - [0x89EE0, lib, libultra/libultra, pfssearchfile] + - [0x8A0A0, lib, libultra/libultra, pimgr] + - [0x8A230, lib, libultra/libultra, cartrominit] + - [0x8A330, lib, libultra/libultra, piacs] - [0x8A3F0, pad] - - [0x8A400, lib, libultra, devmgr] - - [0x8A890, lib, libultra, pirawdma] - - [0x8A970, lib, libultra, seteventmesg] - - [0x8A9E0, lib, libultra, sqrtf] - - [0x8A9F0, lib, libultra, contquery] - - [0x8AAA0, lib, libultra, xprintf] - - [0x8B760, lib, libultra, epidma] - - [0x8B840, lib, libultra, leodiskinit] - - [0x8B940, lib, libultra, syncprintf] - - [0x8B980, lib, libultra, string] - - [0x8BA20, lib, libultra, createmesgqueue] - - [0x8BA50, lib, libultra, invalicache] - - [0x8BAD0, lib, libultra, invaldcache] - - [0x8BB80, lib, libultra, sp] - - [0x8BBB0, lib, libultra, si] - - [0x8BBE0, lib, libultra, jammesg] - - [0x8BD30, lib, libultra, setthreadpri] - - [0x8BE10, lib, libultra, getthreadpri] - - [0x8BE30, lib, libultra, viswapbuf] - - [0x8BEE0, lib, libultra, mtxcatl] - - [0x8BF40, lib, libultra, mtxcatf] - - [0x8C150, lib, libultra, epirawdma] - - [0x8C380, lib, libultra, sptaskyielded] - - [0x8C400, lib, libultra, bcmp] - - [0x8C520, lib, libultra, gettime] - - [0x8C5B0, lib, libultra, timerintr] - - [0x8C9B0, lib, libultra, setglobalintmask] - - [0x8CA00, lib, libultra, aisetfreq] - - [0x8CB60, lib, libultra, dpctr] - - [0x8CBB0, lib, libultra, crc] - - [0x8CD30, lib, libultra, getactivequeue] - - [0x8CD40, lib, libultra, setcompare] - - [0x8CD50, lib, libultra, normalize] - - [0x8CDE0, lib, libultra, dpsetstat] - - [0x8CDF0, lib, libultra, bcopy] - - [0x8D100, lib, libultra, resetglobalintmask] - - [0x8D160, lib, libultra, pfsdeletefile] - - [0x8D780, lib, libultra, ortho] - - [0x8D940, lib, libultra, interrupt] - - [0x8D980, lib, libultra, vi] - - [0x8DAC0, lib, libultra, viswapcontext] - - [0x8DE20, lib, libultra, pigetcmdq] - - [0x8DE50, lib, libultra, cosf] - - [0x8DFC0, lib, libultra, coss] - - [0x8DFF0, lib, libultra, visetspecial] - - [0x8E1B0, lib, libultra, visetevent] - - [0x8E220, lib, libultra, pfsisplug] - - [0x8E560, lib, libultra, pfsnumfiles] - - [0x8E6B0, lib, libultra, us2dex] - - [0x8E830, lib, libultra, contsetch] - - [0x8E8A0, lib, libultra, setfpccsr] - - [0x8E8B0, lib, libultra, pfsfilestate] - - [0x8EBA0, lib, libultra, pfsinitpak] - - [0x8EE40, lib, libultra, pfsgetstatus] - - [0x8F080, lib, libultra, pfschecker] - - [0x8FAE0, lib, libultra, aigetlen] - - [0x8FAF0, lib, libultra, epirawread] - - [0x8FC90, lib, libultra, maptlbrdb] - - [0x8FCF0, lib, libultra, yieldthread] - - [0x8FD40, lib, libultra, translate] - - [0x8FDE0, lib, libultra, contramwrite] - - [0x90140, lib, libultra, epirawwrite] - - [0x902D0, lib, libultra, settimer] - - [0x903B0, lib, libultra, xldtob] - - [0x90E70, lib, libultra, ldiv] - - [0x91000, lib, libultra, xlitob] - - [0x912A0, lib, libultra, sirawwrite] - - [0x912F0, lib, libultra, spsetstat] - - [0x91300, lib, libultra, spgetstat] - - [0x91310, lib, libultra, writebackdcacheall] - - [0x91340, lib, libultra, getcurrfaultthread] - - [0x91350, lib, libultra, contramread] - - [0x916B0, lib, libultra, llcvt] - - [0x918C0, lib, libultra, startthread] + - [0x8A400, lib, libultra/libultra, devmgr] + - [0x8A890, lib, libultra/libultra, pirawdma] + - [0x8A970, lib, libultra/libultra, seteventmesg] + - [0x8A9E0, lib, libultra/libultra, sqrtf] + - [0x8A9F0, lib, libultra/libultra, contquery] + - [0x8AAA0, lib, libultra/libultra, xprintf] + - [0x8B760, lib, libultra/libultra, epidma] + - [0x8B840, lib, libultra/libultra, leodiskinit] + - [0x8B940, lib, libultra/libultra, syncprintf] + - [0x8B980, lib, libultra/libultra, string] + - [0x8BA20, lib, libultra/libultra, createmesgqueue] + - [0x8BA50, lib, libultra/libultra, invalicache] + - [0x8BAD0, lib, libultra/libultra, invaldcache] + - [0x8BB80, lib, libultra/libultra, sp] + - [0x8BBB0, lib, libultra/libultra, si] + - [0x8BBE0, lib, libultra/libultra, jammesg] + - [0x8BD30, lib, libultra/libultra, setthreadpri] + - [0x8BE10, lib, libultra/libultra, getthreadpri] + - [0x8BE30, lib, libultra/libultra, viswapbuf] + - [0x8BEE0, lib, libultra/libultra, mtxcatl] + - [0x8BF40, lib, libultra/libultra, mtxcatf] + - [0x8C150, lib, libultra/libultra, epirawdma] + - [0x8C380, lib, libultra/libultra, sptaskyielded] + - [0x8C400, lib, libultra/libultra, bcmp] + - [0x8C520, lib, libultra/libultra, gettime] + - [0x8C5B0, lib, libultra/libultra, timerintr] + - [0x8C9B0, lib, libultra/libultra, setglobalintmask] + - [0x8CA00, lib, libultra/libultra, aisetfreq] + - [0x8CB60, lib, libultra/libultra, dpctr] + - [0x8CBB0, lib, libultra/libultra, crc] + - [0x8CD30, lib, libultra/libultra, getactivequeue] + - [0x8CD40, lib, libultra/libultra, setcompare] + - [0x8CD50, lib, libultra/libultra, normalize] + - [0x8CDE0, lib, libultra/libultra, dpsetstat] + - [0x8CDF0, lib, libultra/libultra, bcopy] + - [0x8D100, lib, libultra/libultra, resetglobalintmask] + - [0x8D160, lib, libultra/libultra, pfsdeletefile] + - [0x8D780, lib, libultra/libultra, ortho] + - [0x8D940, lib, libultra/libultra, interrupt] + - [0x8D980, lib, libultra/libultra, vi] + - [0x8DAC0, lib, libultra/libultra, viswapcontext] + - [0x8DE20, lib, libultra/libultra, pigetcmdq] + - [0x8DE50, lib, libultra/libultra, cosf] + - [0x8DFC0, lib, libultra/libultra, coss] + - [0x8DFF0, lib, libultra/libultra, visetspecial] + - [0x8E1B0, lib, libultra/libultra, visetevent] + - [0x8E220, lib, libultra/libultra, pfsisplug] + - [0x8E560, lib, libultra/libultra, pfsnumfiles] + - [0x8E6B0, lib, libultra/libultra, us2dex] + - [0x8E830, lib, libultra/libultra, contsetch] + - [0x8E8A0, lib, libultra/libultra, setfpccsr] + - [0x8E8B0, lib, libultra/libultra, pfsfilestate] + - [0x8EBA0, lib, libultra/libultra, pfsinitpak] + - [0x8EE40, lib, libultra/libultra, pfsgetstatus] + - [0x8F080, lib, libultra/libultra, pfschecker] + - [0x8FAE0, lib, libultra/libultra, aigetlen] + - [0x8FAF0, lib, libultra/libultra, epirawread] + - [0x8FC90, lib, libultra/libultra, maptlbrdb] + - [0x8FCF0, lib, libultra/libultra, yieldthread] + - [0x8FD40, lib, libultra/libultra, translate] + - [0x8FDE0, lib, libultra/libultra, contramwrite] + - [0x90140, lib, libultra/libultra, epirawwrite] + - [0x902D0, lib, libultra/libultra, settimer] + - [0x903B0, lib, libultra/libultra, xldtob] + - [0x90E70, lib, libultra/libultra, ldiv] + - [0x91000, lib, libultra/libultra, xlitob] + - [0x912A0, lib, libultra/libultra, sirawwrite] + - [0x912F0, lib, libultra/libultra, spsetstat] + - [0x91300, lib, libultra/libultra, spgetstat] + - [0x91310, lib, libultra/libultra, writebackdcacheall] + - [0x91340, lib, libultra/libultra, getcurrfaultthread] + - [0x91350, lib, libultra/libultra, contramread] + - [0x916B0, lib, libultra/libultra, llcvt] + - [0x918C0, lib, libultra/libultra, startthread] - [0x91A10, pad] - - [0x91A20, lib, libultra, vimgr] - - [0x91D80, lib, libultra, vigetcurrcontext] - - [0x91D90, asm, ../lib/ultralib/src/io/conteepread] # [0x91D90, lib, libultra, conteepread] - - [0x920F0, lib, libultra, vigetcurrframebuf] - - [0x92130, lib, libultra, spsetpc] + - [0x91A20, lib, libultra/libultra, vimgr] + - [0x91D80, lib, libultra/libultra, vigetcurrcontext] + - [0x91D90, asm, ../lib/ultralib/src/io/conteepread] # [0x91D90, lib, libultra/libultra, conteepread] + - [0x920F0, lib, libultra/libultra, vigetcurrframebuf] + - [0x92130, lib, libultra/libultra, spsetpc] - [0x92170, data] @@ -255,25 +255,25 @@ - [0xAAFA0, .data, O2/stackcheck] # Libultra - - [0xAAFB0, lib, libultra, sins, .data] - - [0xAB7B0, data, ../lib/ultralib/src/gu/us2dex_emu] # [0xAB7B0, lib, libultra, us2dex_emu, .data] - - [0xAB7E0, lib, libultra, exceptasm, .data] - - [0xAB800, lib, libultra, thread, .data] - - [0xAB820, data, ../lib/ultralib/src/io/controller] # [0xAB820, lib, libultra, controller, .data] - - [0xAB830, lib, libultra, siacs, .data] - - [0xAB840, lib, libultra, initialize, .data] - - [0xAB860, lib, libultra, vitbl, .data] - - [0xAC580, lib, libultra, motor, .data] - - [0xAC590, lib, libultra, pimgr, .data] - - [0xAC5C0, lib, libultra, piacs, .data] - - [0xAC5D0, lib, libultra, xprintf, .data] - - [0xAC620, lib, libultra, timerintr, .data] - - [0xAC630, lib, libultra, vimodentsclan1, .data] - - [0xAC680, lib, libultra, vi, .data] - - [0xAC6F0, lib, libultra, vimodepallan1, .data] - - [0xAC740, lib, libultra, vimodempallan1, .data] - - [0xAC790, lib, libultra, xlitob, .data] - - [0xAC7C0, lib, libultra, vimgr, .data] + - [0xAAFB0, lib, libultra/libultra, sins, .data] + - [0xAB7B0, data, ../lib/ultralib/src/gu/us2dex_emu] # [0xAB7B0, lib, libultra/libultra, us2dex_emu, .data] + - [0xAB7E0, lib, libultra/libultra, exceptasm, .data] + - [0xAB800, lib, libultra/libultra, thread, .data] + - [0xAB820, data, ../lib/ultralib/src/io/controller] # [0xAB820, lib, libultra/libultra, controller, .data] + - [0xAB830, lib, libultra/libultra, siacs, .data] + - [0xAB840, lib, libultra/libultra, initialize, .data] + - [0xAB860, lib, libultra/libultra, vitbl, .data] + - [0xAC580, lib, libultra/libultra, motor, .data] + - [0xAC590, lib, libultra/libultra, pimgr, .data] + - [0xAC5C0, lib, libultra/libultra, piacs, .data] + - [0xAC5D0, lib, libultra/libultra, xprintf, .data] + - [0xAC620, lib, libultra/libultra, timerintr, .data] + - [0xAC630, lib, libultra/libultra, vimodentsclan1, .data] + - [0xAC680, lib, libultra/libultra, vi, .data] + - [0xAC6F0, lib, libultra/libultra, vimodepallan1, .data] + - [0xAC740, lib, libultra/libultra, vimodempallan1, .data] + - [0xAC790, lib, libultra/libultra, xlitob, .data] + - [0xAC7C0, lib, libultra/libultra, vimgr, .data] - [0xAC7E0, rodata] @@ -361,16 +361,16 @@ - [0xB3D80, .rodata, O2/math64] # # Libultra - - [0xB3DA0, lib, libultra, setintmask, .rodata] - - [0xB3E20, lib, libultra, sinf, .rodata] - - [0xB3E70, lib, libultra, exceptasm, .rodata] - - [0xB3EC0, lib, libultra, perspective, .rodata] - - [0xB3ED0, lib, libultra, devmgr, .rodata] - - [0xB3EF0, lib, libultra, xprintf, .rodata] - - [0xB3FF0, lib, libultra, cosf, .rodata] - - [0xB4040, lib, libultra, libm_vals, .rodata] - - [0xB4050, lib, libultra, xldtob, .rodata] - - [0xB40B0, lib, libultra, llcvt, .rodata] + - [0xB3DA0, lib, libultra/libultra, setintmask, .rodata] + - [0xB3E20, lib, libultra/libultra, sinf, .rodata] + - [0xB3E70, lib, libultra/libultra, exceptasm, .rodata] + - [0xB3EC0, lib, libultra/libultra, perspective, .rodata] + - [0xB3ED0, lib, libultra/libultra, devmgr, .rodata] + - [0xB3EF0, lib, libultra/libultra, xprintf, .rodata] + - [0xB3FF0, lib, libultra/libultra, cosf, .rodata] + - [0xB4040, lib, libultra/libultra, libm_vals, .rodata] + - [0xB4050, lib, libultra/libultra, xldtob, .rodata] + - [0xB40B0, lib, libultra/libultra, llcvt, .rodata] - [0xB40C0, rodata] - [0xB4C80, rodata] @@ -385,21 +385,21 @@ - {type: .bss, vram: 0x8010ED90, name: 7EFD0} # Libultra - - {type: bss, vram: 0x8010F0C0, name: ../lib/ultralib/src/io/sptask} # {type: lib, vram: 0x8010F0C0, name: libultra, object: sptask, section: .bss} - - {type: bss, vram: 0x8010F100, name: ../lib/ultralib/src/gu/us2dex_emu} # {type: lib, vram: 0x8010F100, name: libultra, object: us2dex_emu, section: .bss} - - {type: lib, vram: 0x8010F120, name: libultra, object: leointerrupt, section: .bss} - - {type: bss, vram: 0x80110120, name: ../lib/ultralib/src/io/controller} # {type: lib, vram: 0x80110120, name: libultra, object: controller, section: .bss} - - {type: lib, vram: 0x801101B0, name: libultra, object: siacs, section: .bss} - - {type: lib, vram: 0x801101D0, name: libultra, object: driverominit, section: .bss} - - {type: lib, vram: 0x80110250, name: libultra, object: initialize, section: .bss} - - {type: lib, vram: 0x80110260, name: libultra, object: kdebugserver, section: .bss} - - {type: lib, vram: 0x80110410, name: libultra, object: motor, section: .bss} - - {type: lib, vram: 0x80110650, name: libultra, object: pimgr, section: .bss} - - {type: lib, vram: 0x80111820, name: libultra, object: cartrominit, section: .bss} - - {type: lib, vram: 0x801118A0, name: libultra, object: piacs, section: .bss} - - {type: lib, vram: 0x801118C0, name: libultra, object: seteventmesg, section: .bss} - - {type: lib, vram: 0x80111940, name: libultra, object: leodiskinit, section: .bss} - - {type: lib, vram: 0x801119C0, name: libultra, object: timerintr, section: .bss} - - {type: lib, vram: 0x80111A00, name: libultra, object: pfsisplug, section: .bss} - - {type: lib, vram: 0x80111A40, name: libultra, object: vimgr, section: .bss} - - {type: bss, vram: 0x80112C60, name: ../lib/ultralib/src/io/conteepread} # {type: lib, vram: 0x80112C60, name: libultra, object: conteepread, section: .bss} + - {type: bss, vram: 0x8010F0C0, name: ../lib/ultralib/src/io/sptask} # {type: lib, vram: 0x8010F0C0, name: libultra/libultra, object: sptask, section: .bss} + - {type: bss, vram: 0x8010F100, name: ../lib/ultralib/src/gu/us2dex_emu} # {type: lib, vram: 0x8010F100, name: libultra/libultra, object: us2dex_emu, section: .bss} + - {type: lib, vram: 0x8010F120, name: libultra/libultra, object: leointerrupt, section: .bss} + - {type: bss, vram: 0x80110120, name: ../lib/ultralib/src/io/controller} # {type: lib, vram: 0x80110120, name: libultra/libultra, object: controller, section: .bss} + - {type: lib, vram: 0x801101B0, name: libultra/libultra, object: siacs, section: .bss} + - {type: lib, vram: 0x801101D0, name: libultra/libultra, object: driverominit, section: .bss} + - {type: lib, vram: 0x80110250, name: libultra/libultra, object: initialize, section: .bss} + - {type: lib, vram: 0x80110260, name: libultra/libultra, object: kdebugserver, section: .bss} + - {type: lib, vram: 0x80110410, name: libultra/libultra, object: motor, section: .bss} + - {type: lib, vram: 0x80110650, name: libultra/libultra, object: pimgr, section: .bss} + - {type: lib, vram: 0x80111820, name: libultra/libultra, object: cartrominit, section: .bss} + - {type: lib, vram: 0x801118A0, name: libultra/libultra, object: piacs, section: .bss} + - {type: lib, vram: 0x801118C0, name: libultra/libultra, object: seteventmesg, section: .bss} + - {type: lib, vram: 0x80111940, name: libultra/libultra, object: leodiskinit, section: .bss} + - {type: lib, vram: 0x801119C0, name: libultra/libultra, object: timerintr, section: .bss} + - {type: lib, vram: 0x80111A00, name: libultra/libultra, object: pfsisplug, section: .bss} + - {type: lib, vram: 0x80111A40, name: libultra/libultra, object: vimgr, section: .bss} + - {type: bss, vram: 0x80112C60, name: ../lib/ultralib/src/io/conteepread} # {type: lib, vram: 0x80112C60, name: libultra/libultra, object: conteepread, section: .bss}