Bring our own chainloader for *hax

Author: AuroraWright

.gitmodules

@@ -1,3 +1,9 @@
-[submodule "CakeBrah"]
-	path = CakeBrah
-	url = https://github.com/mid-kid/CakeBrah
+[submodule "haxloader/CakeBrah"]
+	path = haxloader/CakeBrah
+	url = https://github.com/mid-kid/CakeBrah.git
+[submodule "haxloader/CakeHax"]
+	path = haxloader/CakeHax
+	url = https://github.com/mid-kid/CakeHax.git
+[submodule "haxloader/CakesROP"]
+	path = haxloader/CakesROP
+	url = https://github.com/mid-kid/CakesROP.git

CakeBrah

@@ -22,15 +22,13 @@ dir_injector := injector
 dir_exceptions := exceptions
 dir_arm9_exceptions := $(dir_exceptions)/arm9
 dir_arm11_exceptions := $(dir_exceptions)/arm11
-dir_cakebrah := CakeBrah
-dir_diffs := diffs
+dir_haxloader := haxloader
 dir_build := build
 dir_out := out
 
 ASFLAGS := -mcpu=arm946e-s
 CFLAGS := -Wall -Wextra -MMD -MP -marm $(ASFLAGS) -fno-builtin -fshort-wchar -std=c11 -Wno-main -O2 -flto -ffast-math
 LDFLAGS := -nostartfiles
-FLAGS := name=$(name).dat dir_out=$(abspath $(dir_out)) ICON=$(abspath icon.png) APP_DESCRIPTION="Noob-friendly 3DS CFW." APP_AUTHOR="Aurora Wright/TuxSH" --no-print-directory
 
 objects = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
           $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
@@ -46,23 +44,22 @@ define bin2o
 endef
 
 .PHONY: all
-all: a9lh cakebrah menuhax
+all: a9lh haxloader
 
 .PHONY: release
 release: $(dir_out)/$(name)$(revision).7z
 
-.PHONY: menuhax
-menuhax: $(dir_out)/menuhax/boot.3dsx
-
-.PHONY: cakebrah
-cakebrah: $(dir_out)/3ds/$(name)
-
 .PHONY: a9lh
 a9lh: $(dir_out)/arm9loaderhax.bin
 
+.PHONY: haxloader
+haxloader: a9lh
+	@mkdir -p $(dir_out)
+	@$(MAKE) -C $(dir_haxloader)
+
 .PHONY: clean
 clean:
-	@$(MAKE) $(FLAGS) -C $(dir_cakebrah) clean
+	@$(MAKE) $(FLAGS) -C $(dir_haxloader) clean
 	@$(MAKE) -C $(dir_loader) clean
 	@$(MAKE) -C $(dir_arm9_exceptions) clean
 	@$(MAKE) -C $(dir_arm11_exceptions) clean	
@@ -71,23 +68,12 @@ clean:
 
 .PRECIOUS: $(dir_build)/%.bin
 
-$(dir_out):
-	@mkdir -p "$(dir_out)"
+$(dir_out) $(dir_build):
+	@mkdir -p "$@"
 
 $(dir_out)/$(name)$(revision).7z: all
 	@7z a -mx $@ ./$(@D)/* ./$(dir_exceptions)/exception_dump_parser.py
 
-$(dir_out)/menuhax/boot.3dsx: $(dir_diffs) $(dir_out)
-	@mkdir -p "$(@D)"
-	@cd $(dir_cakebrah); patch -p1 < ../$(dir_diffs)/1.diff; patch -p1 < ../$(dir_diffs)/2.diff; $(MAKE) $(FLAGS); git reset --hard
-	@mv $(dir_out)/$(name).3dsx $@
-	@rm $(dir_out)/$(name).smdh
-
-$(dir_out)/3ds/$(name): $(dir_diffs) $(dir_out)
-	@mkdir -p "$@"
-	@cd $(dir_cakebrah); patch -p1 < ../$(dir_diffs)/1.diff; $(MAKE) $(FLAGS); git reset --hard
-	@mv $(dir_out)/$(name).3dsx $(dir_out)/$(name).smdh $@
-
 $(dir_out)/arm9loaderhax.bin: $(dir_build)/main.bin $(dir_out)
 	@cp -a $(dir_build)/main.bin $@
 
@@ -98,27 +84,21 @@ $(dir_build)/main.elf: $(bundled) $(objects)
 	$(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^
 
 $(dir_build)/%.bin.o: $(dir_build)/%.bin
-	@mkdir -p "$(@D)"
 	@$(bin2o)
 
-$(dir_build)/injector.bin: $(dir_injector)/Makefile
-	@mkdir -p "$(@D)"
-	@$(MAKE) -C $(dir_injector)
+$(dir_build)/injector.bin: $(dir_injector) $(dir_build)
+	@$(MAKE) -C $<
 
-$(dir_build)/loader.bin: $(dir_loader)/Makefile
-	@mkdir -p "$(@D)"
-	@$(MAKE) -C $(dir_loader)
+$(dir_build)/loader.bin: $(dir_loader) $(dir_build)
+	@$(MAKE) -C $<
 
-$(dir_build)/arm9_exceptions.bin: $(dir_arm9_exceptions)/Makefile
-	@mkdir -p "$(@D)"
-	@$(MAKE) -C $(dir_arm9_exceptions)
+$(dir_build)/arm9_exceptions.bin: $(dir_arm9_exceptions) $(dir_build)
+	@$(MAKE) -C $<
 
-$(dir_build)/arm11_exceptions.bin: $(dir_arm11_exceptions)/Makefile
-	@mkdir -p "$(@D)"
-	@$(MAKE) -C $(dir_arm11_exceptions)
+$(dir_build)/arm11_exceptions.bin: $(dir_arm11_exceptions) $(dir_build)
+	@$(MAKE) -C $<
 
-$(dir_build)/%.bin: $(dir_patches)/%.s
-	@mkdir -p "$(@D)"
+$(dir_build)/%.bin: $(dir_patches)/%.s $(dir_build)
 	@armips $<
 
 $(dir_build)/memory.o $(dir_build)/strings.o: CFLAGS += -O3

Makefile

@@ -0,0 +1,77 @@
+rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+include $(DEVKITARM)/3ds_rules
+
+CC := arm-none-eabi-gcc
+AS := arm-none-eabi-as
+LD := arm-none-eabi-ld
+OC := arm-none-eabi-objcopy
+
+name := Luma3DS
+
+dir_source := source
+dir_cakebrah := CakeBrah
+dir_cakehax := CakeHax
+dir_cakesrop := CakesROP
+dir_build := build
+dir_out := ../out
+
+ASFLAGS := -mcpu=arm946e-s
+CFLAGS := -Wall -Wextra -MMD -MP -marm $(ASFLAGS) -fno-builtin -fshort-wchar -std=c11 -Wno-main -O2 -flto -ffast-math
+LDFLAGS := -nostartfiles
+FLAGS := name=$(name).dat dir_out=$(abspath $(dir_out)) ICON=$(abspath icon.png) APP_DESCRIPTION="Noob-friendly 3DS CFW." APP_AUTHOR="Aurora Wright/TuxSH" --no-print-directory
+ROP_FLAGS := DATNAME=$(name).dat DISPNAME=$(name).dat GRAPHICS=../data/
+
+objects = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
+          $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
+          $(call rwildcard, $(dir_source), *.s *.c)))
+
+.PHONY: all
+all: $(dir_out)/$(name).dat $(dir_out)/3ds/$(name) $(dir_out)/menuhax/boot.3dsx $(dir_out)/$(name).nds
+
+.PHONY: clean
+clean:
+	@$(MAKE) $(FLAGS) -C $(dir_cakebrah) clean
+	@$(MAKE) $(FLAGS) -C $(dir_cakehax) clean
+	@$(MAKE) $(ROP_FLAGS) -C $(dir_cakesrop) clean
+	@rm -rf $(dir_build)
+
+$(dir_out)/$(name).dat: $(dir_build)/main.bin
+	@$(MAKE) $(FLAGS) -C $(dir_cakehax) launcher
+	@dd if=$(dir_build)/main.bin of=$@ bs=512 seek=144
+
+$(dir_out)/3ds/$(name):
+	@mkdir -p "$@"
+	@$(MAKE) $(FLAGS) -C $(dir_cakebrah)
+	@mv $(dir_out)/$(name).3dsx $(dir_out)/$(name).smdh $@
+
+$(dir_out)/menuhax/boot.3dsx: menuhax.diff
+	@mkdir -p "$(@D)"
+	@cd $(dir_cakebrah); patch -p1 < ../menuhax.diff; $(MAKE) $(FLAGS); git reset --hard
+	@mv $(dir_out)/$(name).3dsx $@
+	@rm $(dir_out)/$(name).smdh
+
+$(dir_out)/$(name).nds:
+	@$(MAKE) $(ROP_FLAGS) -C $(dir_cakesrop)
+	@mv $(dir_cakesrop)/CakesROP.nds $@
+
+$(dir_build)/main.bin: $(dir_build)/main.elf
+	$(OC) -S -O binary $< $@
+
+$(dir_build)/main.elf: $(objects) ../$(dir_build)/loader.bin.o
+	$(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^
+
+$(dir_build)/memory.o: CFLAGS += -O3
+
+$(dir_build)/%.o: $(dir_source)/%.c $(bundled)
+	@mkdir -p "$(@D)"
+	$(COMPILE.c) $(OUTPUT_OPTION) $<
+
+$(dir_build)/%.o: $(dir_source)/%.s
+	@mkdir -p "$(@D)"
+	$(COMPILE.s) $(OUTPUT_OPTION) $<
+include $(call rwildcard, $(dir_build), *.d)

diffs/1.diff

@@ -0,0 +1,11 @@
+-W3
+# disable alpha and set opaque bit for all pixels
+-gT!
+
+# use lz77 compression
+-gzl
+
+# 16 bit bitmap
+-gB16
+
+-gb

haxloader/CakeHax

@@ -0,0 +1,25 @@
+LD  := arm-none-eabi-ld
+AS  := arm-none-eabi-as
+OC  := arm-none-eabi-objcopy
+XXD := xxd
+
+all: loader.h
+
+loader.o: loader.s
+	$(AS) -o $@ $<
+
+loader.elf: loader.o
+	$(LD) -T stub.ld -o $@ $<
+
+loader.bin: loader.elf
+	$(OC) -O binary $< $@
+
+loader.h: loader.bin
+	$(XXD) -i $< > $@
+	@rm -f *.elf *.o
+	@echo built loader
+
+.PHONY: clean
+clean:
+	@rm -f *.h *.bin *.elf *.o
+	@echo cleaned loader