From 15a107bee1af718bf620ecbaf61f87ddf44c5a8e Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Sat, 29 Jun 2019 21:32:13 +0200 Subject: [PATCH] Some more changes for a fully working KL ITS build. --- .circleci/config.yml | 1 + build/kl10/include.tcl | 36 +++++++++++++++++++----------------- build/pdp10-kl/start | 14 +------------- src/l/*lisp.154 | 2 +- src/l/struct.658 | 2 +- 5 files changed, 23 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7182a0b2..04543968 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,5 +65,6 @@ workflows: build: jobs: - build_ka10 + - build_kl10 - build_klh10 - build_simh diff --git a/build/kl10/include.tcl b/build/kl10/include.tcl index 7f524b40..fe1cbf32 100644 --- a/build/kl10/include.tcl +++ b/build/kl10/include.tcl @@ -163,27 +163,29 @@ proc clib_switches {} { } proc patch_lisp {} { - respond "*" ":job lisp\r" - respond "*" ":load .; @ lisp\r" - respond "*" "33777//\031" - respond "*" "\033q\033,777777\033\033z" - respond "*" "pitele+13/" - respond "FSC" "push p,b\n" - respond "FSC" "jrst patch\r" - respond "\n" "patch/" - respond "0" "move b,echocc\n" - respond "0" "add b,ticc\n" - respond "0" "dpb b,.+3\n" - respond "0" "pop p,b\n" - respond "0" "jrst pitele+15\n" - respond "0" "331000,,a\r" - respond "\n" "\033y" - respond " " "dsk0:.;@ lisp\r" - respond "*" ":kill\r" } proc translate_diagnostics {} { + respond "*" "\033\024" + respond " " "dsk: maint; part f, part f.old\r" + respond "*" "\033\024" + respond " " "dsk: maint; part g, part g.old\r" + respond "*" "\033\024" + respond " " "dsk: maint; part k, part k.old\r" } proc patch_clib_16 {} { + respond "*" ":job clib\r" + respond "*" "\033\060l" + respond " " "c; \[clib\] 16\r" + respond "*" "23237/" + respond "FIX" "ufa 1,775763\n" + respond "JRST" "tlo 2,777000\r" + respond "\n" "23244/" + respond "FIX" "ufa 1,775763\n" + respond "MOVN" "tlo 2,777000\n" + respond "JRST" "movn 2,2\r" + respond "\n" "\033\060y" + respond " " "c; \[clib\] 16\r" + respond "*" ":kill\r" } diff --git a/build/pdp10-kl/start b/build/pdp10-kl/start index 1760196e..676ff7bc 100755 --- a/build/pdp10-kl/start +++ b/build/pdp10-kl/start @@ -1,7 +1,5 @@ #!/bin/sh -TVCON=${TVCON:--2} - EXIT=: trap "" QUIT INT TERM @@ -24,20 +22,10 @@ gt40() { started GT40 "$!" } -tv11() { - (sleep 3; tools/tv11/tv11 -p 10011 localhost >tv11.log 2>&1) & - started TV-11 "$!" -} - -tvcon() { - (sleep 4; tools/tv11/tvcon/tvcon $TVCON localhost >tvcon.log 2>&1) & - started "TV-console" "$!" -} - while test -n "$1"; do "$1" shift done -tools/sims/BIN/pdp10-ka build/pdp10-ka/run +tools/sims/BIN/pdp10-ka build/pdp10-kl/run exit 0 diff --git a/src/l/*lisp.154 b/src/l/*lisp.154 index 1b6b4910..3ed79b52 100644 --- a/src/l/*lisp.154 +++ b/src/l/*lisp.154 @@ -15489,7 +15489,7 @@ IFN ITS,[ .VALUE SETZ A, ;CONVERT TO ATOMIC SYMBOL HLRZS TT - IRP X,,[AI,ML,MC,MD,MX,DB,KA] + IRP X,,[AI,ML,MC,MD,MX,DB,KA,KL] CAIN TT,(SIXBIT \X\) MOVEI A,Q!X TERMIN diff --git a/src/l/struct.658 b/src/l/struct.658 index 9bc0147c..aa83fea8 100644 --- a/src/l/struct.658 +++ b/src/l/struct.658 @@ -715,7 +715,7 @@ PG$ MRA PAGING MRA PPN 20$ MRA PS IFN ITS,[ - MRA [ITS,AI,ML,MC,MD,MX,DB,KA] + MRA [ITS,AI,ML,MC,MD,MX,DB,KA,KL] MRA EXPERIMENTAL MRA .LISP. ] ;END OF IFN ITS