diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index aca4bc0c..6fb668af 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -44,7 +44,9 @@ The full set of tests is only run for tagged releases. - ci.yml: define TBW_GHDL_OPTS and suppress IEEE package warnings at t=0ms - **/tbrun.yml: since nexys4 not longer available switch to nexys4d - tools/bin - - asm-11: limited macro support (.macro,.endm); added -E,-M option + - asm-11: + - limited macro support (.macro,.endm) + - added -E (export code) and -M (dependency rules) options - create_disk: -help: print byte size of disk - njobihtm: add -n and -h options - tbrun_tbwrri: fully implement --r(l|b)mon diff --git a/tools/asm-11/lib/tcode_std_start.mac b/tools/asm-11/lib/tcode_std_start.mac index 92bcd7e4..2134414b 100644 --- a/tools/asm-11/lib/tcode_std_start.mac +++ b/tools/asm-11/lib/tcode_std_start.mac @@ -1,8 +1,14 @@ -; $Id: tcode_std_start.mac 1263 2022-07-28 09:00:42Z mueller $ +; $Id: tcode_std_start.mac 1275 2022-08-10 08:10:40Z mueller $ ; SPDX-License-Identifier: GPL-3.0-or-later ; Copyright 2015-2022 by Walter F.J. Mueller ; ; Default tcode startup code +; +; Revision History: +; Date Rev Version Comment +; 2022-08-08 1275 1.1.1 BUGFIX: fix sdreg probe code +; 2022-07-28 1263 1.1 ensure PRI=0, ignore startup state (for e11) +; 2015-11-02 712 1.0 Initial version ; .include |lib/defs_bits.mac| .include |lib/defs_cpu.mac| @@ -45,7 +51,7 @@ start: reset ; general reset mov #100$,v..iit ; setup IIT handler mov #cp.pr7,v..iit+2 ; - mov 200$,r5 ; setup failed probe code pointer + mov #200$,r5 ; setup failed probe code pointer mov @#cp.dsr,r0 ; test switch register clr @#cp.dsr ; test display register br 300$ diff --git a/tools/make/generic_asm11.mk b/tools/make/generic_asm11.mk index cecc02f5..a8baa6dc 100644 --- a/tools/make/generic_asm11.mk +++ b/tools/make/generic_asm11.mk @@ -1,9 +1,10 @@ -# $Id: generic_asm11.mk 1168 2019-06-20 11:52:51Z mueller $ +# $Id: generic_asm11.mk 1275 2022-08-10 08:10:40Z mueller $ # SPDX-License-Identifier: GPL-3.0-or-later -# Copyright 2013- by Walter F.J. Mueller +# Copyright 2013-2022 by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment +# 2022-08-08 1275 1.1 add auto-dependency rule # 2013-04-06 503 1.0.1 use --hostinc for mac2lda # 2013-03-22 496 1.0 Initial version #--- @@ -45,3 +46,8 @@ endif # %.lstexp : %.lsterr $(ASM11EXP) $< +# +# auto-dependency rule +# +%.dep : %.mac + $(ASM11) -M $< > $@ diff --git a/tools/make/generic_asm11_def.mk b/tools/make/generic_asm11_def.mk index d24056d8..85965fd0 100644 --- a/tools/make/generic_asm11_def.mk +++ b/tools/make/generic_asm11_def.mk @@ -1,9 +1,10 @@ -# $Id: generic_asm11_def.mk 1168 2019-06-20 11:52:51Z mueller $ +# $Id: generic_asm11_def.mk 1275 2022-08-10 08:10:40Z mueller $ # SPDX-License-Identifier: GPL-3.0-or-later -# Copyright 2019- by Walter F.J. Mueller +# Copyright 2019-2022 by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment +# 2022-08-09 1275 1.1 add auto-dependency rule # 2019-05-07 1147 1.0 Initial version #--- # @@ -11,8 +12,10 @@ MAC_all = $(wildcard *.mac) LDA_all = $(MAC_all:.mac=.lda) COF_all = $(MAC_all:.mac=.cof) LST_all = $(MAC_all:.mac=.lst) +DEP_all = $(MAC_all:.mac=.dep) # include ${RETROBASE}/tools/make/generic_asm11.mk +include ${RETROBASE}/tools/make/dontincdep.mk # .PHONY : all alllda allcof alllst clean # @@ -31,3 +34,15 @@ clean : @ echo "Compound files removed" @ rm -f $(LST_all) @ echo "Listing files removed" +# +cleandep : + @ rm -f $(DEP_all) + @ echo "Dependency files removed" +# +distclean : clean cleandep +# +# The magic auto-dependency include +# +ifndef DONTINCDEP +include $(DEP_all) +endif diff --git a/tools/tcode/Makefile b/tools/tcode/Makefile index 3bb57094..46f04ef1 100644 --- a/tools/tcode/Makefile +++ b/tools/tcode/Makefile @@ -1,13 +1,15 @@ -# $Id: Makefile 1264 2022-07-30 07:42:17Z mueller $ +# $Id: Makefile 1275 2022-08-10 08:10:40Z mueller $ # SPDX-License-Identifier: GPL-3.0-or-later # Copyright 2022- by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment +# 2022-08-08 1275 1.1 add auto-dependency rule # 2022-07-29 1264 1.0 Initial version #--- # include ${RETROBASE}/tools/make/generic_asm11.mk +include ${RETROBASE}/tools/make/dontincdep.mk # MAC_all += cpu_badinst_nofpp.mac MAC_all += cpu_basics.mac @@ -23,6 +25,8 @@ TSIM_all = $(MAC_all:.mac=.tsim) TE11_all = $(MAC_all:.mac=.te11) TW11_all = $(MAC_all:.mac=.tw11) # +DEP_all = $(MAC_all:.mac=.dep) +# # create export mac (with asm-11 -E) %.exp.mac : %.mac asm-11 -E $< > $@ @@ -73,6 +77,18 @@ allte11 : $(TE11_all) alltw11 : $(TW11_all) # clean : - rm -rf *.lst - rm -rf *.lda - rm -rf *.exp.mac + rm -f *.lst + rm -f *.lda + rm -f *.exp.mac +# +cleandep : + rm -f *.dep +# +distclean : clean cleandep + + +# The magic auto-dependency include +# +ifndef DONTINCDEP +include $(DEP_all) +endif diff --git a/tools/tcode/tcode_exec.scmd b/tools/tcode/tcode_exec.scmd index ccc8d944..fc5215d2 100644 --- a/tools/tcode/tcode_exec.scmd +++ b/tools/tcode/tcode_exec.scmd @@ -1,4 +1,4 @@ -; $Id: tcode_exec.scmd 1264 2022-07-30 07:42:17Z mueller $ +; $Id: tcode_exec.scmd 1275 2022-08-10 08:10:40Z mueller $ ; SPDX-License-Identifier: GPL-3.0-or-later ; Copyright 2022- by Walter F.J. Mueller ; @@ -16,7 +16,7 @@ set cpu idle ; dep STOP_TRAPS 0 ; +dep pc 0200 load %1.lda -dep pc 200 cont quit