restructure boot section

- move sources from done/ to boot/
- seperate libultra sources to boot/ultra/

.gitignore

@@ -10,7 +10,7 @@ asm/data
 asm/*.s
 asm/*/*.s
 asm/core1/os
-!asm/ultra
+!asm/boot/ultra
 !asm/core1/ultra
 build/*
 build/

Makefile

@@ -67,7 +67,7 @@ BUILD_ROOT        := build
 BUILD_DIR         := $(BUILD_ROOT)/$(VERSION)
 ALL_ASSET_FILES   := $(shell find $(ASSET_ROOT) -type f -iname '*.*' 2> /dev/null)
 C_SRCS            := $(shell find $(SRC_ROOT) -type f -iname '*.c' 2> /dev/null)
-BOOT_C_SRCS       := $(wildcard $(SRC_ROOT)/done/*.c)
+BOOT_C_SRCS       := $(shell find $(SRC_ROOT)/boot -type f -iname '*.c' 2> /dev/null)
 ALL_ASM_SRCS      := $(filter-out $(ASM_ROOT)/$(NONMATCHINGS), $(shell find $(ASM_ROOT) -name $(NONMATCHINGS) -prune -o -iname '*.s' 2> /dev/null))
 ALL_BINS          := $(shell find $(BIN_ROOT) -type f -iname '*.bin' 2> /dev/null)
 # Files referenced in the splat file
@@ -117,7 +117,7 @@ ALL_OBJS             := $(C_OBJS) $(ASM_OBJS) $(BIN_OBJS)
 SYMBOL_ADDRS         := symbol_addrs.$(VERSION).txt
 SYMBOL_ADDR_FILES    := $(filter-out $(SYMBOL_ADDRS), $(wildcard symbol_addrs.*.$(VERSION).txt))
 MIPS3_OBJS           := $(BUILD_DIR)/$(SRC_ROOT)/core1/ll.c.o $(BUILD_DIR)/$(SRC_ROOT)/core1/ll_cvt.c.o
-BOOT_MIPS3_OBJS      := $(BUILD_DIR)/$(SRC_ROOT)/done/ll.c.o
+BOOT_MIPS3_OBJS      := $(BUILD_DIR)/$(SRC_ROOT)/boot/ultra/ll.c.o
 BOOT_C_OBJS          := $(filter-out $(BOOT_MIPS3_OBJS),$(BOOT_C_OBJS))
 COMPRESSED_SYMBOLS   := $(BUILD_DIR)/compressed_symbols.txt
 
@@ -374,6 +374,7 @@ clean:
 	@$(RM) -rf $(ASM_ROOT)/*.s
 	@$(RM) -rf $(addprefix $(ASM_ROOT)/,$(filter-out core1,$(OVERLAYS)))
 	@$(RM) -rf $(ASM_ROOT)/data
+	@$(RM) -rf $(ASM_ROOT)/boot/*.s
 	@$(RM) -rf $(ASM_ROOT)/core1/*.s
 	@$(RM) -rf $(ASM_ROOT)/core1/os
 	@$(RM) -f *.ld
@@ -390,39 +391,38 @@ build/$(VERSION)/src/core1/ll.c.o: MIPSBIT := -mips3 -o32
 build/$(VERSION)/src/core1/ll_cvt.c.o: OPT_FLAGS := -O1
 build/$(VERSION)/src/core1/ll_cvt.c.o: MIPSBIT := -mips3 -o32
 
-build/$(VERSION)/src/bk_boot_27F0.c.o: OPT_FLAGS = -O2
-build/$(VERSION)/src/done/destroythread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/pirawdma.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/thread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/pimgr.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/destroythread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/pirawdma.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/thread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/pimgr.c.o: OPT_FLAGS := -O1
 build/$(VERSION)/src/getthreadid.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/setthreadpri.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/createthread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/yieldthread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/setglobalintmask.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/recvmesg.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/startthread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/devmgr.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/sendmesg.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/pigetstat.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/si.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/resetglobalintmask.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/epirawwrite.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/epirawread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/createmesgqueue.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/leodiskinit.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/virtualtophysical.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/ll.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/ll.c.o: MIPSBIT := -mips3 -o32
-build/$(VERSION)/src/done/sirawwrite.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/sirawread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/initialize.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/pirawread.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/seteventmesg.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/siacs.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/cartrominit.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/leointerrupt.c.o: OPT_FLAGS := -O1
-build/$(VERSION)/src/done/epirawdma.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/setthreadpri.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/createthread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/yieldthread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/setglobalintmask.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/recvmesg.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/startthread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/devmgr.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/sendmesg.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/pigetstat.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/si.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/resetglobalintmask.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/epirawwrite.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/epirawread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/createmesgqueue.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/leodiskinit.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/virtualtophysical.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/ll.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/ll.c.o: MIPSBIT := -mips3 -o32
+build/$(VERSION)/src/boot/ultra/sirawwrite.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/sirawread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/initialize.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/pirawread.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/seteventmesg.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/siacs.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/cartrominit.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/leointerrupt.c.o: OPT_FLAGS := -O1
+build/$(VERSION)/src/boot/ultra/epirawdma.c.o: OPT_FLAGS := -O1
 
 # Disable implicit rules
 MAKEFLAGS += -r

decompressed.pal.yaml

@@ -41,78 +41,79 @@ segments:
   subsegments:
   - [0x1000, hasm, entry]
 - name:  boot/bk_boot
+  dir: boot
   type:  code
   start: 0x1050
   vram:  0x80000450
   subsegments:
-  - [0x1050, c, done/bk_boot_1050]
-  - [0x1150, c, done/rarezip]
-  - [0x12B0, c, done/inflate]
-  - [0x27F0, c, done/overlays]
-  - [0x2970, c, done/initialize]
-  - [0x2C00, c, done/pirawdma]
-  - [0x2CE0, c, done/pigetstat]
+  - [0x1050, c, bk_boot_1050]
+  - [0x1150, c, rarezip]
+  - [0x12B0, c, inflate]
+  - [0x27F0, c, overlays]
+  - [0x2970, c, ultra/initialize]
+  - [0x2C00, c, ultra/pirawdma]
+  - [0x2CE0, c, ultra/pigetstat]
   - [0x2CF0, hasm, bzero]
   - [0x2D90, hasm, setsr]
   - [0x2DA0, hasm, getsr]
   - [0x2DB0, hasm, setfpccsr]
-  - [0x2DC0, c, done/sirawread]
-  - [0x2E10, c, done/sirawwrite]
+  - [0x2DC0, c, ultra/sirawread]
+  - [0x2E10, c, ultra/sirawwrite]
   - [0x2E60, hasm, ultra/exceptasm]
   - [0x3770, hasm, writebackdcache]
   - [0x37F0, hasm, invalicache]
   - [0x3870, hasm, maptlbrdb]
-  - [0x38D0, c, done/pirawread]
-  - [0x3930, c, done/ll]
+  - [0x38D0, c, ultra/pirawread]
+  - [0x3930, c, ultra/ll]
   - [0x3BF0, hasm, ultra/parameters]
-  - [0x3C50, c, done/virtualtophysical]
-  - [0x3CD0, c, done/si]
-  - [0x3D00, c, done/thread]
-  - [0x3D40, c, done/leointerrupt]
-  - [0x45C0, c, done/seteventmesg]
+  - [0x3C50, c, ultra/virtualtophysical]
+  - [0x3CD0, c, ultra/si]
+  - [0x3D00, c, ultra/thread]
+  - [0x3D40, c, ultra/leointerrupt]
+  - [0x45C0, c, ultra/seteventmesg]
   - [0x4630, hasm, ultra/setintmask]
-  - [0x46D0, c, done/destroythread]
+  - [0x46D0, c, ultra/destroythread]
   - [0x47D0, hasm, probetlb]
-  - [0x4890, c, done/leodiskinit]
-  - [0x4990, c, done/epirawdma]
+  - [0x4890, c, ultra/leodiskinit]
+  - [0x4990, c, ultra/epirawdma]
   - [0x4BC0, hasm, interrupt]
-  - [0x4C00, c, done/pimgr]
-  - [0x4D90, c, done/cartrominit]
-  - [0x4E90, c, done/createmesgqueue]
-  - [0x4EC0, c, done/piacs]
-  - [0x4F80, c, done/getthreadpri]
-  - [0x4FA0, c, done/setthreadpri]
-  - [0x5080, c, done/createthread]
-  - [0x51D0, c, done/devmgr]
-  - [0x5660, c, done/startthread]
-  - [0x57B0, c, done/sendmesg]
-  - [0x5900, c, done/recvmesg]
-  - [0x5A40, c, done/resetglobalintmask]
-  - [0x5AA0, c, done/epirawwrite]
-  - [0x5AF0, c, done/epirawread]
-  - [0x5B40, c, done/setglobalintmask]
-  - [0x5B90, c, done/yieldthread]
-  - [0x5BE0, c, done/kdebugserver]
-  - [0x5BE0, .data, done/inflate]
-  - [0x5CE0, .data, done/initialize]
+  - [0x4C00, c, ultra/pimgr]
+  - [0x4D90, c, ultra/cartrominit]
+  - [0x4E90, c, ultra/createmesgqueue]
+  - [0x4EC0, c, ultra/piacs]
+  - [0x4F80, c, ultra/getthreadpri]
+  - [0x4FA0, c, ultra/setthreadpri]
+  - [0x5080, c, ultra/createthread]
+  - [0x51D0, c, ultra/devmgr]
+  - [0x5660, c, ultra/startthread]
+  - [0x57B0, c, ultra/sendmesg]
+  - [0x5900, c, ultra/recvmesg]
+  - [0x5A40, c, ultra/resetglobalintmask]
+  - [0x5AA0, c, ultra/epirawwrite]
+  - [0x5AF0, c, ultra/epirawread]
+  - [0x5B40, c, ultra/setglobalintmask]
+  - [0x5B90, c, ultra/yieldthread]
+  - [0x5BE0, c, ultra/kdebugserver]
+  - [0x5BE0, .data, inflate]
+  - [0x5CE0, .data, ultra/initialize]
   - [0x5D00, .data, ultra/exceptasm]
-  - [0x5D20, .data, done/thread]
-  - [0x5D40, .data, done/pimgr]
-  - [0x5D70, .data, done/piacs]
+  - [0x5D20, .data, ultra/thread]
+  - [0x5D40, .data, ultra/pimgr]
+  - [0x5D70, .data, ultra/piacs]
   - [0x5D80, .rodata, ultra/exceptasm]
   - [0x5DD0, .rodata, ultra/setintmask]
-  - [0x5E50, .rodata, done/devmgr]
-  - [0x5E70, .bss, done/bk_boot_1050]
-  - [0x5E70, .bss, done/rarezip]
-  - [0x5E70, .bss, done/inflate]
-  - [0x5E70, .bss, done/initialize]
-  - [0x5E70, .bss, done/kdebugserver]
-  - [0x5E70, .bss, done/leointerrupt]
-  - [0x5E70, .bss, done/seteventmesg]
-  - [0x5E70, .bss, done/leodiskinit]
-  - [0x5E70, .bss, done/pimgr]
-  - [0x5E70, .bss, done/cartrominit]
-  - [0x5E70, .bss, done/piacs]
+  - [0x5E50, .rodata, ultra/devmgr]
+  - [0x5E70, .bss, bk_boot_1050]
+  - [0x5E70, .bss, rarezip]
+  - [0x5E70, .bss, inflate]
+  - [0x5E70, .bss, ultra/initialize]
+  - [0x5E70, .bss, ultra/kdebugserver]
+  - [0x5E70, .bss, ultra/leointerrupt]
+  - [0x5E70, .bss, ultra/seteventmesg]
+  - [0x5E70, .bss, ultra/leodiskinit]
+  - [0x5E70, .bss, ultra/pimgr]
+  - [0x5E70, .bss, ultra/cartrominit]
+  - [0x5E70, .bss, ultra/piacs]
 - name: crc
   type: bin
   start: 0x5E70

decompressed.us.v10.yaml

@@ -41,78 +41,79 @@ segments:
   subsegments:
   - [0x1000, hasm, entry]
 - name:  boot/bk_boot
+  dir: boot
   type:  code
   start: 0x1050
   vram:  0x80000450
   subsegments:
-  - [0x1050, c, done/bk_boot_1050]
-  - [0x1150, c, done/rarezip]
-  - [0x12B0, c, done/inflate]
-  - [0x27F0, c, done/overlays]
-  - [0x2970, c, done/initialize]
-  - [0x2C00, c, done/pirawdma]
-  - [0x2CE0, c, done/pigetstat]
+  - [0x1050, c, bk_boot_1050]
+  - [0x1150, c, rarezip]
+  - [0x12B0, c, inflate]
+  - [0x27F0, c, overlays]
+  - [0x2970, c, ultra/initialize]
+  - [0x2C00, c, ultra/pirawdma]
+  - [0x2CE0, c, ultra/pigetstat]
   - [0x2CF0, hasm, bzero]
   - [0x2D90, hasm, setsr]
   - [0x2DA0, hasm, getsr]
   - [0x2DB0, hasm, setfpccsr]
-  - [0x2DC0, c, done/sirawread]
-  - [0x2E10, c, done/sirawwrite]
+  - [0x2DC0, c, ultra/sirawread]
+  - [0x2E10, c, ultra/sirawwrite]
   - [0x2E60, hasm, ultra/exceptasm]
   - [0x3770, hasm, writebackdcache]
   - [0x37F0, hasm, invalicache]
   - [0x3870, hasm, maptlbrdb]
-  - [0x38D0, c, done/pirawread]
-  - [0x3930, c, done/ll]
+  - [0x38D0, c, ultra/pirawread]
+  - [0x3930, c, ultra/ll]
   - [0x3BF0, hasm, ultra/parameters]
-  - [0x3C50, c, done/virtualtophysical]
-  - [0x3CD0, c, done/si]
-  - [0x3D00, c, done/thread]
-  - [0x3D40, c, done/leointerrupt]
-  - [0x45C0, c, done/seteventmesg]
+  - [0x3C50, c, ultra/virtualtophysical]
+  - [0x3CD0, c, ultra/si]
+  - [0x3D00, c, ultra/thread]
+  - [0x3D40, c, ultra/leointerrupt]
+  - [0x45C0, c, ultra/seteventmesg]
   - [0x4630, hasm, ultra/setintmask]
-  - [0x46D0, c, done/destroythread]
+  - [0x46D0, c, ultra/destroythread]
   - [0x47D0, hasm, probetlb]
-  - [0x4890, c, done/leodiskinit]
-  - [0x4990, c, done/epirawdma]
+  - [0x4890, c, ultra/leodiskinit]
+  - [0x4990, c, ultra/epirawdma]
   - [0x4BC0, hasm, interrupt]
-  - [0x4C00, c, done/pimgr]
-  - [0x4D90, c, done/cartrominit]
-  - [0x4E90, c, done/createmesgqueue]
-  - [0x4EC0, c, done/piacs]
-  - [0x4F80, c, done/getthreadpri]
-  - [0x4FA0, c, done/setthreadpri]
-  - [0x5080, c, done/createthread]
-  - [0x51D0, c, done/devmgr]
-  - [0x5660, c, done/startthread]
-  - [0x57B0, c, done/sendmesg]
-  - [0x5900, c, done/recvmesg]
-  - [0x5A40, c, done/resetglobalintmask]
-  - [0x5AA0, c, done/epirawwrite]
-  - [0x5AF0, c, done/epirawread]
-  - [0x5B40, c, done/setglobalintmask]
-  - [0x5B90, c, done/yieldthread]
-  - [0x5BE0, c, done/kdebugserver]
-  - [0x5BE0, .data, done/inflate]
-  - [0x5CE0, .data, done/initialize]
+  - [0x4C00, c, ultra/pimgr]
+  - [0x4D90, c, ultra/cartrominit]
+  - [0x4E90, c, ultra/createmesgqueue]
+  - [0x4EC0, c, ultra/piacs]
+  - [0x4F80, c, ultra/getthreadpri]
+  - [0x4FA0, c, ultra/setthreadpri]
+  - [0x5080, c, ultra/createthread]
+  - [0x51D0, c, ultra/devmgr]
+  - [0x5660, c, ultra/startthread]
+  - [0x57B0, c, ultra/sendmesg]
+  - [0x5900, c, ultra/recvmesg]
+  - [0x5A40, c, ultra/resetglobalintmask]
+  - [0x5AA0, c, ultra/epirawwrite]
+  - [0x5AF0, c, ultra/epirawread]
+  - [0x5B40, c, ultra/setglobalintmask]
+  - [0x5B90, c, ultra/yieldthread]
+  - [0x5BE0, c, ultra/kdebugserver]
+  - [0x5BE0, .data, inflate]
+  - [0x5CE0, .data, ultra/initialize]
   - [0x5D00, .data, ultra/exceptasm]
-  - [0x5D20, .data, done/thread]
-  - [0x5D40, .data, done/pimgr]
-  - [0x5D70, .data, done/piacs]
+  - [0x5D20, .data, ultra/thread]
+  - [0x5D40, .data, ultra/pimgr]
+  - [0x5D70, .data, ultra/piacs]
   - [0x5D80, .rodata, ultra/exceptasm]
   - [0x5DD0, .rodata, ultra/setintmask]
-  - [0x5E50, .rodata, done/devmgr]
-  - [0x5E70, .bss, done/bk_boot_1050]
-  - [0x5E70, .bss, done/rarezip]
-  - [0x5E70, .bss, done/inflate]
-  - [0x5E70, .bss, done/initialize]
-  - [0x5E70, .bss, done/kdebugserver]
-  - [0x5E70, .bss, done/leointerrupt]
-  - [0x5E70, .bss, done/seteventmesg]
-  - [0x5E70, .bss, done/leodiskinit]
-  - [0x5E70, .bss, done/pimgr]
-  - [0x5E70, .bss, done/cartrominit]
-  - [0x5E70, .bss, done/piacs]
+  - [0x5E50, .rodata, ultra/devmgr]
+  - [0x5E70, .bss, bk_boot_1050]
+  - [0x5E70, .bss, rarezip]
+  - [0x5E70, .bss, inflate]
+  - [0x5E70, .bss, ultra/initialize]
+  - [0x5E70, .bss, ultra/kdebugserver]
+  - [0x5E70, .bss, ultra/leointerrupt]
+  - [0x5E70, .bss, ultra/seteventmesg]
+  - [0x5E70, .bss, ultra/leodiskinit]
+  - [0x5E70, .bss, ultra/pimgr]
+  - [0x5E70, .bss, ultra/cartrominit]
+  - [0x5E70, .bss, ultra/piacs]
 - name: crc
   type: bin
   start: 0x5E70