mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-15 06:06:04 +00:00
Code Issues Projects Releases Wiki Activity

Move driverominit and sprintf to src/boot/ (#2105)

Browse source
This commit is contained in:
cadmic 2024-08-29 13:34:18 -07:00 committed by GitHub
parent 5e9704b464
commit a63f0a63b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -419,7 +419,9 @@ $(shell mkdir -p $(foreach dir, \
endif endif
ifeq ($(COMPILER),ido) ifeq ($(COMPILER),ido)
$(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2
$(BUILD_DIR)/src/boot/logutils.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/boot/logutils.o: OPTFLAGS := -O2
$(BUILD_DIR)/src/boot/sprintf.o: OPTFLAGS := -O2
$(BUILD_DIR)/src/boot/stackcheck.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/boot/stackcheck.o: OPTFLAGS := -O2
$(BUILD_DIR)/src/code/__osMalloc.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/code/__osMalloc.o: OPTFLAGS := -O2

6
spec
View file

@ -29,12 +29,12 @@ beginseg
include "$(BUILD_DIR)/src/boot/assert.o" include "$(BUILD_DIR)/src/boot/assert.o"
#endif #endif
include "$(BUILD_DIR)/src/boot/is_debug.o" include "$(BUILD_DIR)/src/boot/is_debug.o"
include "$(BUILD_DIR)/src/libultra/io/driverominit.o" include "$(BUILD_DIR)/src/boot/driverominit.o"
include "$(BUILD_DIR)/src/boot/mio0.o" include "$(BUILD_DIR)/src/boot/mio0.o"
include "$(BUILD_DIR)/src/boot/stackcheck.o" include "$(BUILD_DIR)/src/boot/stackcheck.o"
include "$(BUILD_DIR)/src/boot/logutils.o" include "$(BUILD_DIR)/src/boot/logutils.o"
#if OOT_DEBUG #if OOT_DEBUG
include "$(BUILD_DIR)/src/libultra/libc/sprintf.o" include "$(BUILD_DIR)/src/boot/sprintf.o"
#endif #endif
include "$(BUILD_DIR)/src/libultra/io/piacs.o" include "$(BUILD_DIR)/src/libultra/io/piacs.o"
include "$(BUILD_DIR)/src/libultra/os/sendmesg.o" include "$(BUILD_DIR)/src/libultra/os/sendmesg.o"
@ -580,7 +580,7 @@ beginseg
include "$(BUILD_DIR)/src/code/rand.o" include "$(BUILD_DIR)/src/code/rand.o"
include "$(BUILD_DIR)/src/code/__osMalloc.o" include "$(BUILD_DIR)/src/code/__osMalloc.o"
#if !OOT_DEBUG #if !OOT_DEBUG
include "$(BUILD_DIR)/src/libultra/libc/sprintf.o" include "$(BUILD_DIR)/src/boot/sprintf.o"
#endif #endif
include "$(BUILD_DIR)/src/code/printutils.o" include "$(BUILD_DIR)/src/code/printutils.o"
include "$(BUILD_DIR)/src/code/sleep.o" include "$(BUILD_DIR)/src/code/sleep.o"

0
src/libultra/io/driverominit.c → src/boot/driverominit.c
View file

0
src/libultra/libc/sprintf.c → src/boot/sprintf.c
View file

6
tools/disasm/ntsc-1.2/files_boot.csv
View file

@ -7,7 +7,7 @@ C90,800010F0,src/boot/yaz0
FD0,80001430,src/boot/z_locale FD0,80001430,src/boot/z_locale
1070,800014D0,src/boot/cic6105 1070,800014D0,src/boot/cic6105
12F0,80001750,src/boot/is_debug 12F0,80001750,src/boot/is_debug
1350,800017B0,src/libultra/io/driverominit 1350,800017B0,src/boot/driverominit
1530,80001990,src/boot/mio0 1530,80001990,src/boot/mio0
15E0,80001A40,src/boot/stackcheck 15E0,80001A40,src/boot/stackcheck
17F0,80001C50,src/boot/logutils 17F0,80001C50,src/boot/logutils
@ -92,7 +92,7 @@ offset,vram,.data
6340,800067A0,src/boot/z_std_dma 6340,800067A0,src/boot/z_std_dma
6350,800067B0,src/boot/z_locale 6350,800067B0,src/boot/z_locale
6360,800067C0,src/boot/cic6105 6360,800067C0,src/boot/cic6105
63A0,80006800,src/libultra/io/driverominit 63A0,80006800,src/boot/driverominit
63B0,80006810,src/boot/stackcheck 63B0,80006810,src/boot/stackcheck
63C0,80006820,src/libultra/io/piacs 63C0,80006820,src/libultra/io/piacs
63D0,80006830,src/libultra/io/vimodepallan1 63D0,80006830,src/libultra/io/vimodepallan1
@ -127,7 +127,7 @@ offset,vram,.bss
7F00,80008360,src/boot/z_std_dma 7F00,80008360,src/boot/z_std_dma
8670,80008AD0,src/boot/yaz0 8670,80008AD0,src/boot/yaz0
8A80,80008EE0,src/boot/cic6105 8A80,80008EE0,src/boot/cic6105
8AA0,80008F00,src/libultra/io/driverominit 8AA0,80008F00,src/boot/driverominit
8B20,80008F80,src/libultra/io/piacs 8B20,80008F80,src/libultra/io/piacs
8B40,80008FA0,src/libultra/os/initialize 8B40,80008FA0,src/libultra/os/initialize
8B50,80008FB0,src/libultra/io/pimgr 8B50,80008FB0,src/libultra/io/pimgr

1 offset vram .text
7 FD0 80001430 src/boot/z_locale
8 1070 800014D0 src/boot/cic6105
9 12F0 80001750 src/boot/is_debug
10 1350 800017B0 src/libultra/io/driverominit src/boot/driverominit
11 1530 80001990 src/boot/mio0
12 15E0 80001A40 src/boot/stackcheck
13 17F0 80001C50 src/boot/logutils
92 6350 800067B0 src/boot/z_locale
93 6360 800067C0 src/boot/cic6105
94 63A0 80006800 src/libultra/io/driverominit src/boot/driverominit
95 63B0 80006810 src/boot/stackcheck
96 63C0 80006820 src/libultra/io/piacs
97 63D0 80006830 src/libultra/io/vimodepallan1
98 6420 80006880 src/libultra/os/exceptasm
127 8AA0 80008F00 src/libultra/io/driverominit src/boot/driverominit
128 8B20 80008F80 src/libultra/io/piacs
129 8B40 80008FA0 src/libultra/os/initialize
130 8B50 80008FB0 src/libultra/io/pimgr
131 9FC0 8000A420 src/libultra/os/seteventmesg
132 A040 8000A4A0 src/libultra/os/timerintr
133 A080 8000A4E0 src/libultra/io/cartrominit

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

@ -133,7 +133,7 @@ BCA20,800CE100,src/code/fp
BCB80,800CE260,src/code/system_malloc BCB80,800CE260,src/code/system_malloc
BCDF0,800CE4D0,src/code/rand BCDF0,800CE4D0,src/code/rand
BCEF0,800CE5D0,src/code/__osMalloc BCEF0,800CE5D0,src/code/__osMalloc
BD8A0,800CEF80,src/libultra/libc/sprintf BD8A0,800CEF80,src/boot/sprintf
BD970,800CF050,src/code/printutils BD970,800CF050,src/code/printutils
BD9D0,800CF0B0,src/code/jpegutils BD9D0,800CF0B0,src/code/jpegutils
BDEE0,800CF5C0,src/code/jpegdecoder BDEE0,800CF5C0,src/code/jpegdecoder

1 offset vram .text
133 BCB80 800CE260 src/code/system_malloc
134 BCDF0 800CE4D0 src/code/rand
135 BCEF0 800CE5D0 src/code/__osMalloc
136 BD8A0 800CEF80 src/libultra/libc/sprintf src/boot/sprintf
137 BD970 800CF050 src/code/printutils
138 BD9D0 800CF0B0 src/code/jpegutils
139 BDEE0 800CF5C0 src/code/jpegdecoder