From f786d2b9d75c68dc77208ce3de82ece9a7fe2d3b Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 30 Jun 2024 00:12:21 +0200 Subject: [PATCH] Fixed SDCC function argument order. --- lib/make/mb_autoexec.mk | 2 +- lib/make/mb_openmsx.mk | 4 ++-- lib/make/mb_sdcc.mk | 11 ++++++----- test/0module.mk | 4 ++-- test/ahello-sdcc/0module.mk | 6 +++--- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk index dcd1e32..f7a146e 100644 --- a/lib/make/mb_autoexec.mk +++ b/lib/make/mb_autoexec.mk @@ -46,7 +46,7 @@ define mb_autoexec_append_safe_cmd $(call mb_autoexec_append_cmd,$(1),$(2)) endef define mb_autoexec_write_default - @echo === Writing autoexec.bat for $(notdir $(1)) + @echo === Writing autoexec.bat for $@ @echo -n "" > $(1)/autoexec.bat $(if $(filter 40,$(2)),$(call mb_autoexec_append_cmd,$(1),mode 40),$(call mb_autoexec_append_cmd,$(1),mode 80)) $(call mb_autoexec_append_echo,$(1),==== MSXBUILD ====) diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index ec9b07a..358feab 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -37,7 +37,7 @@ define mb_openmsx_setup endef define _mb_openmsx_run - @echo === openMSX Start for $(notdir $(1)) + @echo === openMSX Start for $@ BOOT_WATCHDOG=$(MB_OPENMSX_BOOT_TIMEOUT) \ BOOT_HDD_PATH="$(1)" \ BOOT_HDD_SIZE=$(MB_OPENMSX_HDD_SIZE) \ @@ -58,7 +58,7 @@ define _mb_openmsx_run $(MB_OPENMSX_EXTRA_MEM) \ $(MB_OPENMSX_EXTS) \ -control stdio < $(1)-omsx/stdio.xml - @echo === openMSX Done for $(notdir $(1)) + @echo === openMSX Done for $@ endef define _mb_openmsx_dosctl_bat diff --git a/lib/make/mb_sdcc.mk b/lib/make/mb_sdcc.mk index d22e035..5e9965a 100644 --- a/lib/make/mb_sdcc.mk +++ b/lib/make/mb_sdcc.mk @@ -14,18 +14,18 @@ MB_SDCC_OBJCOPY_CMD ?= $(PATH_SDCC)/sdobjcopy #-l$(LIBASM_LINK) define mb_sdcc_compile_asm - @echo === Compile module asm. - $(MB_SDCC_ASZ80_CMD) $(MB_SDCC_ASZ80_FLAGS) $(1) $(2) + @echo === SDCC Compile module asm for $(2) + $(MB_SDCC_ASZ80_CMD) $(MB_SDCC_ASZ80_FLAGS) $(2) $(1) endef define mb_sdcc_link_asm_lib - @echo === Link module asm lib. + @echo === SDCC Link module asm lib for $(2) $(MB_SDCC_AR_CMD) $(MB_SDCC_AR_FLAGS) $(1) $(2) endef define mb_sdcc_link_asm - @echo === Link asm module at $(3) - $(MB_SDCC_CC_CMD) $(MB_SDCC_FLAG_CPU) $(MB_SDCC_CC_FLAGS) --no-std-crt0 --code-loc $(3) -o $(1) $(2) + @echo === SDCC Link asm module at $(3) for $(2) + $(MB_SDCC_CC_CMD) $(MB_SDCC_FLAG_CPU) $(MB_SDCC_CC_FLAGS) --no-std-crt0 --code-loc $(3) -o $(2) $(1) endef define mb_sdcc_link_asm_0000 $(call mb_sdcc_link_asm,$(1),$(2),0x0000) @@ -50,5 +50,6 @@ define mb_sdcc_link_asm_dos endef define mb_sdcc_hex2bin + @echo === SDCC hex2bin for $(2) $(MB_SDCC_OBJCOPY_CMD) -I ihex --output-target=binary $(1) $(2) endef diff --git a/test/0module.mk b/test/0module.mk index 69b6334..dee67ba 100644 --- a/test/0module.mk +++ b/test/0module.mk @@ -10,11 +10,11 @@ test-dist-qa-msxhub-assert .PHONY: assert-all assert-all: | $(BUILD_TEST) - @echo === All assertions completed. + @echo === All assertions completed .PHONY: assert-all-video assert-all-video: | assert-all @echo === Build session video listing ls -1 bin/test/*-omsx/videos/msxbuild-*.avi | awk -F "bin/test/" -v s="file '" -v e="'" '{print s$$2e}' > bin/test/video-merge.lst ffmpeg -v quiet -y -f concat -i bin/test/video-merge.lst -c copy bin/test/video-session.avi - @echo === Concatted video completed. + @echo === Concatted video completed diff --git a/test/ahello-sdcc/0module.mk b/test/ahello-sdcc/0module.mk index df90a13..8be1893 100644 --- a/test/ahello-sdcc/0module.mk +++ b/test/ahello-sdcc/0module.mk @@ -6,13 +6,13 @@ $(TEST_AHELLO_SDCC): $(call mb_mkdir,$(TEST_AHELLO_SDCC)) $(TEST_AHELLO_SDCC)/%.rel: test/ahello-sdcc/%.asm | $(TEST_AHELLO_SDCC) - $(call mb_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(TEST_AHELLO_SDCC)/ahello.hex: $(TEST_AHELLO_SDCC)/ahello.rel - $(call mb_sdcc_link_asm_dos,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.rel) + $(call mb_sdcc_link_asm_dos,$<,$@) $(TEST_AHELLO_SDCC)/ahello.com: $(TEST_AHELLO_SDCC)/ahello.hex - $(call mb_sdcc_hex2bin,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.com) + $(call mb_sdcc_hex2bin,$<,$@) .PHONY: test-ahello-sdcc-run test-ahello-sdcc-run: $(TEST_AHELLO_SDCC)/ahello.com