pret · GriffinRichards · Nov 26, 2024 · Oct 16, 2024 · Oct 16, 2024 · Nov 25, 2024
diff --git a/Makefile b/Makefile
@@ -150,12 +150,20 @@ ifneq (,$(MAKECMDGOALS))
   endif
 endif
 
+.SHELLSTATUS ?= 0
+
 ifeq ($(SETUP_PREREQS),1)
   # If set on: Default target or a rule requiring a scan
   # Forcibly execute `make tools` since we need them for what we are doing.
-  $(call infoshell, $(MAKE) -f make_tools.mk)
+  $(foreach line, $(shell $(MAKE) -f make_tools.mk | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
+  ifneq ($(.SHELLSTATUS),0)
+    $(error Errors occurred while building tools. See error messages above for more details)
+  endif
   # Oh and also generate mapjson sources before we use `SCANINC`.
-  $(call infoshell, $(MAKE) generated)
+  $(foreach line, $(shell $(MAKE) generated | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
+  ifneq ($(.SHELLSTATUS),0)
+    $(error Errors occurred while generating map-related sources. See error messages above for more details)
+  endif
 endif
 
 # Collect sources
@@ -237,7 +245,10 @@ include spritesheet_rules.mk
 include json_data_rules.mk
 include audio_rules.mk
 
+# NOTE: Tools must have been built prior (FIXME)
+# so you can't really call this rule directly
 generated: $(AUTO_GEN_TARGETS)
+	@: # Silence the "Nothing to be done for `generated'" message, which some people were confusing for an error.
 
 %.s:   ;
 %.png: ;
@@ -252,8 +263,6 @@ generated: $(AUTO_GEN_TARGETS)
 %.lz:     %      ; $(GFX) $< $@
 %.rl:     %      ; $(GFX) $< $@
 
-# NOTE: Tools must have been built prior (FIXME)
-generated: tools $(AUTO_GEN_TARGETS)
 clean-generated:
 	-rm -f $(AUTO_GEN_TARGETS)
 
@@ -287,69 +296,52 @@ endif
 # As a side effect, they're evaluated immediately instead of when the rule is invoked.
 # It doesn't look like $(shell) can be deferred so there might not be a better way (Icedude_907: there is soon).
 
-# For C dependencies.
-# Args: $1 = Output file without extension (build/assets/src/data), $2 = Input file (src/data.c)
-define C_DEP
-$(call C_DEP_IMPL,$1,$2,$1)
-endef
-# Internal implementation details.
-# $1: Output file without extension, $2 input file, $3 temp path (if keeping)
-define C_DEP_IMPL
-$1.o: $2
+$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c
 ifneq ($(KEEP_TEMPS),1)
-	@echo "$$(CC1) <flags> -o $$@ $$<"
-	@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) -i $$< charmap.txt | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
+	@echo "$(CC1) <flags> -o $@ $<"
+	@$(CPP) $(CPPFLAGS) $< | $(PREPROC) -i $< charmap.txt | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
 else
-	@$$(CPP) $$(CPPFLAGS) $$< -o $3.i
-	@$$(PREPROC) $3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $3.s
-	@echo -e ".text\n\t.align\t2, 0 @ Don't pad with nop\n" >> $3.s
-	$$(AS) $$(ASFLAGS) -o $$@ $3.s
+	@$(CPP) $(CPPFLAGS) $< -o $*.i
+	@$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $*.s
+	$(AS) $(ASFLAGS) -o $@ $*.s
 endif
+
+$(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.c
+	$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I tools/agbcc/include $<
+
 ifneq ($(NODEP),1)
-$1.d: $2
-	$(SCANINC) -M $1.d $(INCLUDE_SCANINC_ARGS) -I tools/agbcc/include $2
--include $1.d
+-include $(addprefix $(OBJ_DIR)/,$(C_SRCS:.c=.d))
 endif
-endef
 
-# Create generic rules if no dependency scanning, else create the real rules
-ifeq ($(NODEP),1)
-$(eval $(call C_DEP,$(C_BUILDDIR)/%,$(C_SUBDIR)/%.c))
-else
-$(foreach src,$(C_SRCS),$(eval $(call C_DEP,$(OBJ_DIR)/$(basename $(src)),$(src))))
+$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(ASM_BUILDDIR)/%.d: $(ASM_SUBDIR)/%.s
+	$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I "" $<
+
+ifneq ($(NODEP),1)
+-include $(addprefix $(OBJ_DIR)/,$(ASM_SRCS:.s=.d))
 endif
 
-# Similar methodology for Assembly files
-# $1: Output path without extension, $2: Input file (`*.s`)
-define ASM_DEP
-$1.o: $2
-	$$(AS) $$(ASFLAGS) -o $$@ $$<
-$(call ASM_SCANINC,$1,$2)
-endef
-# As above but first doing a preprocessor pass
-define ASM_DEP_PREPROC
-$1.o: $2
-	$$(PREPROC) $$< charmap.txt | $$(CPP) $(INCLUDE_SCANINC_ARGS) - | $$(PREPROC) -ie $$< charmap.txt | $$(AS) $$(ASFLAGS) -o $$@
-$(call ASM_SCANINC,$1,$2)
-endef
-
-define ASM_SCANINC
+$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s
+	$(PREPROC) $< charmap.txt | $(CPP) $(INCLUDE_SCANINC_ARGS) - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@
+
+$(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.s
+	$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I "" $<
+
 ifneq ($(NODEP),1)
-$1.d: $2
-	$(SCANINC) -M $1.d $(INCLUDE_SCANINC_ARGS) -I "" $2
--include $1.d
+-include $(addprefix $(OBJ_DIR)/,$(C_ASM_SRCS:.s=.d))
 endif
-endef
 
-# Dummy rules or real rules
-ifeq ($(NODEP),1)
-$(eval $(call ASM_DEP,$(ASM_BUILDDIR)/%,$(ASM_SUBDIR)/%.s))
-$(eval $(call ASM_DEP_PREPROC,$(C_BUILDDIR)/%,$(C_SUBDIR)/%.s))
-$(eval $(call ASM_DEP_PREPROC,$(DATA_ASM_BUILDDIR)/%,$(DATA_ASM_SUBDIR)/%.s))
-else
-$(foreach src, $(ASM_SRCS), $(eval $(call ASM_DEP,$(src:%.s=$(OBJ_DIR)/%),$(src))))
-$(foreach src, $(C_ASM_SRCS), $(eval $(call ASM_DEP_PREPROC,$(src:%.s=$(OBJ_DIR)/%),$(src))))
-$(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call ASM_DEP_PREPROC,$(src:%.s=$(OBJ_DIR)/%),$(src))))
+$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s
+	$(PREPROC) $< charmap.txt | $(CPP) $(INCLUDE_SCANINC_ARGS) - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@
+
+$(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s
+	$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I "" $<
+
+ifneq ($(NODEP),1)
+-include $(addprefix $(OBJ_DIR)/,$(REGULAR_DATA_ASM_SRCS:.s=.d))
 endif
 
 $(OBJ_DIR)/sym_bss.ld: sym_bss.txt
@@ -373,8 +365,10 @@ endif
 # Final rules
 
 # Elf from object files
+LDFLAGS = -Map ../../$(MAP)
 $(ELF): $(LD_SCRIPT) $(LD_SCRIPT_DEPS) $(OBJS)
 	@cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat
+	@echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< --print-memory-usage -o ../../$@ <objs> <libs> | cat"
 	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent
 
 # Builds the rom from the elf file

diff --git a/common_syms/AgbRfu_LinkManager.txt b/common_syms/AgbRfu_LinkManager.txt
diff --git a/common_syms/agb_flash.txt b/common_syms/agb_flash.txt
diff --git a/common_syms/battle_anim_special.txt b/common_syms/battle_anim_special.txt
diff --git a/common_syms/battle_controller_pokedude.txt b/common_syms/battle_controller_pokedude.txt
diff --git a/common_syms/battle_main.txt b/common_syms/battle_main.txt
diff --git a/common_syms/berry_fix_program.txt b/common_syms/berry_fix_program.txt
diff --git a/common_syms/bg.txt b/common_syms/bg.txt
diff --git a/common_syms/cable_club.txt b/common_syms/cable_club.txt
diff --git a/common_syms/ereader_screen.txt b/common_syms/ereader_screen.txt
diff --git a/common_syms/event_data.txt b/common_syms/event_data.txt
diff --git a/common_syms/evolution_scene.txt b/common_syms/evolution_scene.txt
diff --git a/common_syms/fame_checker.txt b/common_syms/fame_checker.txt
diff --git a/common_syms/field_camera.txt b/common_syms/field_camera.txt
diff --git a/common_syms/field_control_avatar.txt b/common_syms/field_control_avatar.txt
diff --git a/common_syms/field_specials.txt b/common_syms/field_specials.txt
diff --git a/common_syms/fieldmap.txt b/common_syms/fieldmap.txt
diff --git a/common_syms/help_system.txt b/common_syms/help_system.txt
diff --git a/common_syms/help_system_util.txt b/common_syms/help_system_util.txt
diff --git a/common_syms/image_processing_effects.txt b/common_syms/image_processing_effects.txt
diff --git a/common_syms/librfu_rfu.txt b/common_syms/librfu_rfu.txt
diff --git a/common_syms/librfu_sio32id.txt b/common_syms/librfu_sio32id.txt
diff --git a/common_syms/librfu_stwi.txt b/common_syms/librfu_stwi.txt
diff --git a/common_syms/link.txt b/common_syms/link.txt
diff --git a/common_syms/link_rfu_2.txt b/common_syms/link_rfu_2.txt
diff --git a/common_syms/list_menu.txt b/common_syms/list_menu.txt
diff --git a/common_syms/load_save.txt b/common_syms/load_save.txt
diff --git a/common_syms/m4a.txt b/common_syms/m4a.txt
diff --git a/common_syms/main.txt b/common_syms/main.txt
diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt
diff --git a/common_syms/party_menu.txt b/common_syms/party_menu.txt
diff --git a/common_syms/quest_log.txt b/common_syms/quest_log.txt
diff --git a/common_syms/random.txt b/common_syms/random.txt
diff --git a/common_syms/save.txt b/common_syms/save.txt
diff --git a/common_syms/save_failed_screen.txt b/common_syms/save_failed_screen.txt
diff --git a/common_syms/scrcmd.txt b/common_syms/scrcmd.txt
diff --git a/common_syms/sound.txt b/common_syms/sound.txt
diff --git a/common_syms/sprite.txt b/common_syms/sprite.txt
diff --git a/common_syms/task.txt b/common_syms/task.txt
diff --git a/common_syms/text.txt b/common_syms/text.txt
diff --git a/common_syms/text_printer.txt b/common_syms/text_printer.txt
diff --git a/common_syms/window.txt b/common_syms/window.txt
diff --git a/include/gba/defines.h b/include/gba/defines.h
@@ -13,6 +13,7 @@
 #define IWRAM_DATA __attribute__((section("iwram_data")))
 #define EWRAM_DATA __attribute__((section("ewram_data")))
 #endif
+#define COMMON_DATA __attribute__((section("common_data")))
 
 #if MODERN
 #define NOINLINE __attribute__((noinline))

diff --git a/ld_script.ld b/ld_script.ld
@@ -38,6 +38,7 @@ SECTIONS {
 
         /* COMMON starts at 0x30030E0 */
         INCLUDE "sym_common.ld"
+        src/*.o(COMMON);
 
         *libc.a:sbrkr.o(COMMON);
         end = .;

diff --git a/ld_script_modern.ld b/ld_script_modern.ld
@@ -30,6 +30,7 @@ SECTIONS {
 
         /* COMMON starts at 0x30022A8 */
         *(COMMON);
+        *(common_data);
         end = .;
         __end__ = .;
     } > IWRAM