diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f5e2349..5169ac8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: docker: - image: debian environment: - EMULATOR: "sims" + EMULATOR: "pdp10-ka" steps: - checkout - run: sh -ex build/dependencies.sh install_linux diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c440051e..c076bc42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: ubuntu variables: - EMULATOR: sims + EMULATOR: pdp10-ka stages: - build @@ -13,4 +13,4 @@ job1: - make artifacts: paths: - - out/sims/ + - out/pdp10-ka/ diff --git a/.travis.yml b/.travis.yml index d8f832a6..df210b87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,13 @@ sudo: required env: - EMULATOR=simh BASICS=yes - EMULATOR=klh10 BASICS=yes - - EMULATOR=sims BASICS=yes + - EMULATOR=pdp10-ka BASICS=yes matrix: exclude: - os: osx env: EMULATOR=klh10 BASICS=yes - os: osx - env: EMULATOR=sims BASICS=yes + env: EMULATOR=pdp10-ka BASICS=yes install: sh -ex build/dependencies.sh install_${TRAVIS_OS_NAME:-linux} script: make check-dirs all deploy: diff --git a/Makefile b/Makefile index e26a5c98..35be68fd 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ DSKDMP = bin/ks10/boot/dskdmp.rp06 KLH10=tools/klh10/tmp/bld-ks-its/kn10-ks-its SIMH=tools/simh/BIN/pdp10 -KA10=tools/sims/BIN/ka10 +KA10=tools/sims/BIN/pdp10-ka ITSTAR=tools/itstar/itstar WRITETAPE=tools/tapeutils/tapewrite MAGFRM=tools/dasm/magfrm @@ -82,7 +82,7 @@ out/klh10/stamp: $(OUT)/rp0.dsk out/simh/stamp: $(OUT)/rp0.dsk $(GT40) $(TOUCH) $@ -out/sims/stamp: $(OUT)/rp03.2 $(OUT)/rp03.3 $(GT40) $(TV11) $(PDP6) +out/pdp10-ka/stamp: $(OUT)/rp03.2 $(OUT)/rp03.3 $(GT40) $(TV11) $(PDP6) $(TOUCH) $@ $(OUT)/rp0.dsk: build/simh/init $(OUT)/minsys.tape $(OUT)/minsrc.tape $(OUT)/salv.tape $(OUT)/dskdmp.tape build/build.tcl $(OUT)/sources.tape build/$(EMULATOR)/stamp @@ -153,7 +153,7 @@ build/klh10/stamp: $(KLH10) start build/klh10/dskdmp.ini build/simh/stamp: $(SIMH) start $(TOUCH) $@ -build/sims/stamp: $(KA10) start +build/pdp10-ka/stamp: $(KA10) start $(TOUCH) $@ out/klh10/system: @@ -170,9 +170,9 @@ out/simh/system: $(MKDIR) $(OUT)/system cp build/simh/config.* $(OUT)/system -out/sims/system: +out/pdp10-ka/system: $(MKDIR) $(OUT)/system - cp build/sims/config.* $(OUT)/system + cp build/pdp10-ka/config.* $(OUT)/system build/klh10/dskdmp.ini: build/klh10/dskdmp.txt Makefile cp=';'; ca=''; \ @@ -205,7 +205,7 @@ $(SIMH): $(MAKE) -C tools/simh pdp10 $(KA10): - $(MAKE) -C tools/sims ka10 TYPE340=y + $(MAKE) -C tools/sims pdp10-ka TYPE340=y $(ITSTAR): $(MAKE) -C tools/itstar diff --git a/README.md b/README.md index 30beaa6a..5c56ad31 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ we'd be delighted to test this on a real KS10. To build ITS with this repository, you need some tools installed: make, C compiler, and expect. For KA10, you also need SDL or SDL2 for the Type 340 display. Ensure all submodules are checked out, and then -type `make EMULATOR=simh`, `make EMULATOR=sims`, or `make +type `make EMULATOR=simh`, `make EMULATOR=pdp10-ka`, or `make EMULATOR=klh10`. This will leave built files in the `out` directory, one of which is a disk image with ITS installed. diff --git a/build/dependencies.sh b/build/dependencies.sh index 67f084a6..1f550bc7 100644 --- a/build/dependencies.sh +++ b/build/dependencies.sh @@ -11,7 +11,7 @@ install_linux() { sudo apt-get install -my git make gcc libncurses-dev autoconf case "$EMULATOR" in simh) sudo apt-get install -y simh;; - sims) sudo apt-get install -y libegl1-mesa-dev libgles2-mesa-dev + pdp10-ka) sudo apt-get install -y libegl1-mesa-dev libgles2-mesa-dev sudo apt-get install -y libx11-dev libxt-dev libsdl2-dev sudo apt-get install -y libsdl2-image-dev;; klh10) sudo apt-get install -y libusb-1.0-0-dev;; diff --git a/build/ka10/include.tcl b/build/ka10/include.tcl index b0dbd3e7..cdeb3fb9 100644 --- a/build/ka10/include.tcl +++ b/build/ka10/include.tcl @@ -1,5 +1,5 @@ proc start_dskdmp_its {} { - start_dskdmp build/sims/boot + start_dskdmp build/pdp10-ka/boot respond "DSKDMP" "its\r" patch_its_and_go diff --git a/build/sims/boot b/build/pdp10-ka/boot similarity index 55% rename from build/sims/boot rename to build/pdp10-ka/boot index b3e5bad0..9e27cf22 100644 --- a/build/sims/boot +++ b/build/pdp10-ka/boot @@ -3,8 +3,8 @@ set cpu its set cpu 512k set pd off at ptr bin/ka10/boot/dskdmp.rim -at mta0 out/sims/minsrc.tape -at dpa0 out/sims/rp03.2 -at dpa1 out/sims/rp03.3 +at mta0 out/pdp10-ka/minsrc.tape +at dpa0 out/pdp10-ka/rp03.2 +at dpa1 out/pdp10-ka/rp03.3 set dpa noheaders b ptr diff --git a/build/sims/boot2 b/build/pdp10-ka/boot2 similarity index 53% rename from build/sims/boot2 rename to build/pdp10-ka/boot2 index 01771d6d..bfe254d8 100644 --- a/build/sims/boot2 +++ b/build/pdp10-ka/boot2 @@ -5,12 +5,12 @@ set cpu mpx set cpu ten11 set pd off at ptr bin/ka10/boot/dskdmp.rim -at mta0 out/sims/sources.tape +at mta0 out/pdp10-ka/sources.tape set mta mpx=7 set mta type=b -at dpa0 out/sims/rp03.2 -at dpa1 out/sims/rp03.3 -at dpa2 out/sims/rp03.0 -at dpa3 out/sims/rp03.1 +at dpa0 out/pdp10-ka/rp03.2 +at dpa1 out/pdp10-ka/rp03.3 +at dpa2 out/pdp10-ka/rp03.0 +at dpa3 out/pdp10-ka/rp03.1 set dpa noheaders b ptr diff --git a/build/sims/build.tcl b/build/pdp10-ka/build.tcl similarity index 87% rename from build/sims/build.tcl rename to build/pdp10-ka/build.tcl index 1581bfc5..fb79d959 100644 --- a/build/sims/build.tcl +++ b/build/pdp10-ka/build.tcl @@ -3,7 +3,7 @@ set out "out/$env(EMULATOR)" set emulator_escape "\034" proc start_salv {} { - uplevel #0 {spawn ./tools/sims/BIN/ka10 build/sims/init} + uplevel #0 {spawn ./tools/sims/BIN/pdp10-ka build/pdp10-ka/init} setup_timeout respond "MAGDMP\r\n" "l\033ddt\r" respond "\n" "t\033salv\r" @@ -15,9 +15,9 @@ proc start_dskdmp args { if {[llength $args] == 1} { set ini [lindex $args 0] } { - set ini "build/sims/boot2" + set ini "build/pdp10-ka/boot2" } - set foo "spawn ./tools/sims/BIN/ka10 $ini" + set foo "spawn ./tools/sims/BIN/pdp10-ka $ini" uplevel #0 $foo setup_timeout } diff --git a/build/sims/config.202 b/build/pdp10-ka/config.202 similarity index 100% rename from build/sims/config.202 rename to build/pdp10-ka/config.202 diff --git a/build/sims/gt40 b/build/pdp10-ka/gt40 similarity index 89% rename from build/sims/gt40 rename to build/pdp10-ka/gt40 index 2381f869..21c4aa52 100644 --- a/build/sims/gt40 +++ b/build/pdp10-ka/gt40 @@ -13,5 +13,5 @@ set vt scale=1 set vt address=17772000 set rom enabled set rom0 address=17766000 -at rom0 out/sims/bootvt.img +at rom0 out/pdp10-ka/bootvt.img boot rom0 diff --git a/build/pdp10-ka/init b/build/pdp10-ka/init new file mode 100644 index 00000000..9bba4bae --- /dev/null +++ b/build/pdp10-ka/init @@ -0,0 +1,12 @@ +set console wru=034 +set cpu its +set cpu 512k +at ptr bin/ka10/boot/magdmp.rim +at mta0 out/pdp10-ka/magdmp.tap +at mta5 out/pdp10-ka/ka-minsys.tape +at dpa0 out/pdp10-ka/rp03.2 +at dpa1 out/pdp10-ka/rp03.3 +at dpa2 out/pdp10-ka/rp03.0 +at dpa3 out/pdp10-ka/rp03.1 +set dpa headers +b ptr diff --git a/build/sims/run b/build/pdp10-ka/run similarity index 82% rename from build/sims/run rename to build/pdp10-ka/run index b79cee29..37f664c2 100644 --- a/build/sims/run +++ b/build/pdp10-ka/run @@ -23,10 +23,10 @@ set imp gw=172.31.1.100 set imp host=10.3.0.6 at imp tap:tap0 at ptr bin/ka10/boot/dskdmp.rim -at dpa0 out/sims/rp03.2 -at dpa1 out/sims/rp03.3 -at dpa2 out/sims/rp03.0 -at dpa3 out/sims/rp03.1 +at dpa0 out/pdp10-ka/rp03.2 +at dpa1 out/pdp10-ka/rp03.3 +at dpa2 out/pdp10-ka/rp03.0 +at dpa3 out/pdp10-ka/rp03.1 set mta mpx=7 set mta type=b set dt mpx=6 diff --git a/build/sims/start b/build/pdp10-ka/start similarity index 83% rename from build/sims/start rename to build/pdp10-ka/start index 3fd13553..1760196e 100755 --- a/build/sims/start +++ b/build/pdp10-ka/start @@ -20,7 +20,7 @@ stop() { } gt40() { - (sleep 3; tools/simh/BIN/pdp11 build/sims/gt40 >gt40.log 2>&1) & + (sleep 3; tools/simh/BIN/pdp11 build/pdp10-ka/gt40 >gt40.log 2>&1) & started GT40 "$!" } @@ -39,5 +39,5 @@ while test -n "$1"; do shift done -tools/sims/BIN/ka10 build/sims/run +tools/sims/BIN/pdp10-ka build/pdp10-ka/run exit 0 diff --git a/build/sims/tap.sh b/build/pdp10-ka/tap.sh similarity index 100% rename from build/sims/tap.sh rename to build/pdp10-ka/tap.sh diff --git a/build/sims/init b/build/sims/init deleted file mode 100644 index eff602d2..00000000 --- a/build/sims/init +++ /dev/null @@ -1,12 +0,0 @@ -set console wru=034 -set cpu its -set cpu 512k -at ptr bin/ka10/boot/magdmp.rim -at mta0 out/sims/magdmp.tap -at mta5 out/sims/ka-minsys.tape -at dpa0 out/sims/rp03.2 -at dpa1 out/sims/rp03.3 -at dpa2 out/sims/rp03.0 -at dpa3 out/sims/rp03.1 -set dpa headers -b ptr diff --git a/tools/sims b/tools/sims index 09fe855f..23dab81f 160000 --- a/tools/sims +++ b/tools/sims @@ -1 +1 @@ -Subproject commit 09fe855fd3a2569b590373b0b4b539510660d966 +Subproject commit 23dab81f7a2ec15926db961f8d386ac9df89e976