From 1db0b093789addf0e5691bc071c9c719826e63d9 Mon Sep 17 00:00:00 2001 From: curt mayer Date: Sun, 23 Feb 2020 09:14:21 -0800 Subject: [PATCH 1/3] added support for binary diff --- Binary/Apps/Makefile | 1 + Binary/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/Binary/Apps/Makefile b/Binary/Apps/Makefile index ca8f776a..3fc3e53d 100644 --- a/Binary/Apps/Makefile +++ b/Binary/Apps/Makefile @@ -1,4 +1,5 @@ TOOLS = ../../Tools +MOREDIFF := *.com *.COM Tunes/* include $(TOOLS)/Makefile.inc diff --git a/Binary/Makefile b/Binary/Makefile index 7175f9f2..6c4ebecd 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -1,3 +1,4 @@ +MOREDIFF := *.img *.rom *.com *.eeprom TOOLS = ../Tools SUBDIRS = Apps From e73e0ba5f190aafb914de54f0cee5866e5b49851 Mon Sep 17 00:00:00 2001 From: curt mayer Date: Sun, 23 Feb 2020 15:04:52 -0800 Subject: [PATCH 2/3] diff fixes --- Binary/Apps/Makefile | 2 +- Binary/Makefile | 2 +- Source/HBIOS/Build.sh | 2 +- Source/HBIOS/Makefile | 2 +- Tools/Makefile.inc | 8 +++++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Binary/Apps/Makefile b/Binary/Apps/Makefile index 3fc3e53d..ea259d94 100644 --- a/Binary/Apps/Makefile +++ b/Binary/Apps/Makefile @@ -1,5 +1,5 @@ TOOLS = ../../Tools -MOREDIFF := *.com *.COM Tunes/* +MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.com Tunes/*) include $(TOOLS)/Makefile.inc diff --git a/Binary/Makefile b/Binary/Makefile index 6c4ebecd..c856d1b8 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -1,5 +1,5 @@ -MOREDIFF := *.img *.rom *.com *.eeprom TOOLS = ../Tools +MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.img *.rom *.com *.eeprom) SUBDIRS = Apps include $(TOOLS)/Makefile.inc diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index ed7dadde..17fa3679 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -48,7 +48,7 @@ Apps=(assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm intte timestamp=$(date +%Y-%m-%d) timestamp="2020-02-20" -blankfile=Blank${romsize}.dat +blankfile=Blank${romsize}KB.dat romdiskfile=RomDisk.tmp romfmt=wbw_rom${romsize} outdir=../../Binary diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index f5a36a41..6bdff696 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,4 +1,4 @@ -OBJECTS = ZETA2_std.rom N8_std.rom SBC_std.rom +OBJECTS = ZETA2_std.rom # N8_std.rom SBC_std.rom MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ dbgmon.bin hbios_app.bin imgpad0.bin osimg1.bin romldr.bin \ eastaegg.bin hbios_img.bin imgpad.bin osimg.bin tastybasic.bin \ diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc index 5d5062fc..db6b2b1b 100644 --- a/Tools/Makefile.inc +++ b/Tools/Makefile.inc @@ -148,19 +148,21 @@ ifneq ($(DIFFTO),) @for i in $(OBJECTS) $(MOREDIFF) ; do \ sf=$$($(CASEFN) $$i) ; \ df=$$($(CASEFN) $(DIFFPATH)/$$i) ; \ - if [ -f $$df -a -f $$sf ] ; then \ + if [ -f "$$df" -a -f "$$sf" ] ; then \ if [ "$(VERBOSEDIFF)" ] ; then \ echo compare $$sf and $$df ; \ fi ; \ if ! cmp -s $$sf $$df ; then \ echo " " $$sf and $$df differ ; \ if [ "$(VERBOSEDIFF)" = "2" ] ; then \ - cmp -bl $$sf $$df ; \ hexdump -Cv $$sf > $$sf.dump ; \ hexdump -Cv $$df > $$(basename $$df).dump.diff ; \ fi \ fi \ - fi \ + else \ + if [ ! -f "$$sf" ] ; then echo $$i missing ; fi ; \ + if [ ! -f "$$df" ] ; then echo $(DIFFPATH)/$$i missing ; fi ; \ + fi ; \ done endif From 621083947cb1c94fcdedc025e45a870bc4a100d2 Mon Sep 17 00:00:00 2001 From: curt mayer Date: Sun, 23 Feb 2020 17:46:37 -0800 Subject: [PATCH 3/3] clean, identical build. font source generator emitted .align. this does not match the windows build --- Source/HBIOS/Build.sh | 2 +- Source/HBIOS/Makefile | 44 ++++++++++++++++++++++++++++++------ Tools/Makefile.inc | 3 +++ Tools/unix/bin2asm/bin2asm.c | 2 ++ 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index 17fa3679..1344a610 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -46,7 +46,7 @@ fi Apps=(assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm inttest) timestamp=$(date +%Y-%m-%d) -timestamp="2020-02-20" +#timestamp="2020-02-24" blankfile=Blank${romsize}KB.dat romdiskfile=RomDisk.tmp diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index 6bdff696..b598a3b3 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,4 +1,26 @@ -OBJECTS = ZETA2_std.rom # N8_std.rom SBC_std.rom +OBJECTS = + +ifeq (1,0) +OBJECTS += DYNO_std.rom +OBJECTS += EZZ80_std.rom +OBJECTS += MK4_std.rom +OBJECTS += N8_std.rom +OBJECTS += RCZ180_ext.rom +OBJECTS += RCZ180_nat.rom +OBJECTS += RCZ80_kio.rom +OBJECTS += RCZ80_mt.rom +OBJECTS += RCZ80_std.rom +OBJECTS += RCZ80_wiz.rom +OBJECTS += SBC_simh.rom +OBJECTS += SBC_std.rom +OBJECTS += SCZ180_126.rom +OBJECTS += SCZ180_130.rom +OBJECTS += UNA_std.rom +OBJECTS += ZETA_std.rom +endif + +OBJECTS += ZETA2_std.rom + MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ dbgmon.bin hbios_app.bin imgpad0.bin osimg1.bin romldr.bin \ eastaegg.bin hbios_img.bin imgpad.bin osimg.bin tastybasic.bin \ @@ -7,14 +29,14 @@ MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ SUBDIRS = DEST = ../../Binary TOOLS =../../Tools -OTHERS = *.bin *.z80 cpm.sys zsys.sys Build.inc +OTHERS = *.img *.rom *.com *.bin *.z80 cpm.sys zsys.sys Build.inc include $(TOOLS)/Makefile.inc DIFFPATH = $(DIFFTO)/Binary ROMSIZE=512 -N8_std.rom: ROMSIZE=1024 +N8_std.rom: ROMSIZE=512 %.rom: bash Build.sh $(shell echo $* | tr '_' ' ') $(ROMSIZE) @@ -23,11 +45,19 @@ N8_std.rom: ROMSIZE=1024 # bash Build.sh ZETA2 std 512 hbios_rom.bin: hbios.asm build.inc - $(TASM) -dROMBOOT hbios.asm hbios_rom.bin + $(TASM) -dROMBOOT hbios.asm hbios_rom.bin hbios_rom.lst hbios_app.bin: hbios.asm build.inc - $(TASM) -dAPPBOOT hbios.asm hbios_app.bin + $(TASM) -dAPPBOOT hbios.asm hbios_app.bin hbios_app.lst hbios_img.bin: hbios.asm build.inc - $(TASM) -dIMGBOOT hbios.asm hbios_img.bin - + $(TASM) -dIMGBOOT hbios.asm hbios_img.bin hbios_img.lst + +romldr.bin: build.inc +dbgmon.bin: build.inc +nascom.bin: build.inc + +dumps: + for i in $(MOREDIFF) ; do \ + hexdump -C $$i >$$i.dump ; \ + done diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc index db6b2b1b..4d0c5583 100644 --- a/Tools/Makefile.inc +++ b/Tools/Makefile.inc @@ -165,4 +165,7 @@ ifneq ($(DIFFTO),) fi ; \ done endif + +vdiff: + make VERBOSEDIFF=2 diff diff --git a/Tools/unix/bin2asm/bin2asm.c b/Tools/unix/bin2asm/bin2asm.c index adc2bca8..e9af0fab 100644 --- a/Tools/unix/bin2asm/bin2asm.c +++ b/Tools/unix/bin2asm/bin2asm.c @@ -34,9 +34,11 @@ int main(int argc, char *argv[]) { } // print header +#ifdef notdef printf(" .section .rodata\r\n"); printf(" .global %s\r\n", name); printf(" .align 2\r\n\r\n"); +#endif printf("%s:\r\n\r\n", name); // write lines