diff --git a/Makefile b/Makefile index 86e01f8e..73aa2338 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ KA10=tools/sims/BIN/ka10 ITSTAR=tools/itstar/itstar WRITETAPE=tools/tapeutils/tapewrite MAGFRM=tools/dasm/magfrm +GT40=$(OUT)/bootvt.img H3TEXT=$(shell cd build; ls h3text.*) SMF:=$(addprefix tools/,$(addsuffix /.gitignore,$(SUBMODULES))) @@ -60,10 +61,13 @@ all: $(SMF) $(OUT)/stamp tools/supdup/supdup check: all check-dirs -out/klh10/stamp out/simh/stamp: $(OUT)/rp0.dsk +out/klh10/stamp: $(OUT)/rp0.dsk $(TOUCH) $@ -out/sims/stamp: $(OUT)/rp03.2 $(OUT)/rp03.3 +out/simh/stamp: $(OUT)/rp0.dsk $(GT40) + $(TOUCH) $@ + +out/sims/stamp: $(OUT)/rp03.2 $(OUT)/rp03.3 $(GT40) $(TOUCH) $@ $(OUT)/rp0.dsk: build/simh/init $(OUT)/minsys.tape $(OUT)/salv.tape $(OUT)/dskdmp.tape build/build.tcl $(OUT)/sources.tape build/$(EMULATOR)/stamp @@ -105,6 +109,18 @@ $(OUT)/dskdmp.tape: $(WRITETAPE) $(RAM) $(DSKDMP) $(MKDIR) $(OUT) $(WRITETAPE) -n 2560 $@ $(RAM) $(DSKDMP) +$(OUT)/tmp/gt40/bootvt.bin: $(OUT)/output.tape + rm -rf $(OUT)/tmp + mkdir -p $(OUT)/tmp + $(ITSTAR) -xf $< -C $(OUT)/tmp + +tools/dasm/palx: tools/dasm/palx.c + $(MAKE) -C tools/dasm palx + +$(OUT)/bootvt.img: $(OUT)/tmp/gt40/bootvt.bin tools/dasm/palx + mkdir -p out/gt40 + tools/dasm/palx -I < $< > $@ + start: build/$(EMULATOR)/start $(LN) -s $< $* diff --git a/build/basics.tcl b/build/basics.tcl index efb8daab..0a207e5b 100644 --- a/build/basics.tcl +++ b/build/basics.tcl @@ -298,3 +298,11 @@ respond "*" ":link sys;ts dec\021 *,must; be here\r" respond "*" ":midas decsys;_decbot\r" expect ":KILL" + +# palx +respond "*" ":midas sys;ts palx_sysen1;palx\r" +expect ":KILL" + +# GT40 boot ROM. +respond "*" ":palx gt40;_gt40;bootvt\r" +expect ":KILL" diff --git a/build/misc.tcl b/build/misc.tcl index 363e1008..86d42746 100644 --- a/build/misc.tcl +++ b/build/misc.tcl @@ -500,10 +500,6 @@ respond "*" ":midas sys1;ts who%_sysen3;who%\r" expect ":KILL" respond "*" ":link sys1;ts %,sys1;ts who%\r" -# palx -respond "*" ":midas sys;ts palx_sysen1;palx\r" -expect ":KILL" - # Old PALX respond "*" ":midas sys3;ts plx143_rms;palx 143\r" expect ":KILL" @@ -1064,10 +1060,6 @@ respond "=YES" "1\r" respond "37000" "37000\r" expect ":KILL" -# GT40 boot ROM. -respond "*" ":palx gt40;_gt40;bootvt\r" -expect ":KILL" - # GT40 Lunar Lander. respond "*" ":palx gt40;_gt40;gtlem\r" expect ":KILL" diff --git a/tools/dasm b/tools/dasm index 1bc11e07..2055ae47 160000 --- a/tools/dasm +++ b/tools/dasm @@ -1 +1 @@ -Subproject commit 1bc11e072c4b7c1997331632fe6cad02e8fdae0f +Subproject commit 2055ae47c8c9955c3b85f066a7065a41d3652492