Add "loader", "linker", and "decuuo" TCL procedures.

Author: larsbrinkhoff

build/build.tcl

@@ -181,6 +181,31 @@ proc macro {target sources} {
     respond "*" ":kill\r"
 }
 
+proc loader {files} {
+    respond "*" ":dec sys:loader\r"
+    respond "*" "$files/g\r"
+    expect "EXIT"
+}
+
+proc linker {files} {
+    respond "*" ":dec sys:link\r"
+    respond "*" "$files/go\r"
+    expect "EXIT" {
+        return
+    } "%LNKNED" {
+        # Sometimes there is this error; workaround is to retry.
+        respond "*" "$files/go\r"
+        expect "EXIT"
+    }
+}
+
+proc decuuo {file} {
+    respond "*" ":start 45\r"
+    respond "Command:" "d"
+    respond "*" ":pdump $file\r"
+    respond "*" ":kill\r"
+}
+
 proc cwd {directory} {
     respond "*" ":cwd $directory\r"
 }

build/kl10/processor.tcl

@@ -47,13 +47,8 @@ copy_to_klfe "ucode;u1 ram"
 # KLDDT
 cwd "kldcp"
 macro "klddt" "klddt"
-respond "*" ":dec sys:link\r"
-respond "*" "klddt/go\r"
-respond "EXIT" ":start 45\r"
-respond "Command:" "d"
-respond "*" "\033y"
-respond " " "kldcp; klddt bin\r"
-respond "*" ":kill\r"
+linker "klddt"
+decuuo "kldcp; klddt bin"
 respond "*" ":mcnvrt kldcp; klddt bin\r"
 expect ":KILL"
 move_to_klfe "kldcp; klddt a10"

build/misc.tcl

@@ -472,14 +472,11 @@ respond "*" "advent=advent\r"
 expect "CORE USED"
 respond "*" "\032"
 type ":kill\r"
-respond "*" ":dec sys:loader\r"
-respond "*" "advent/g\r"
-respond "EXIT" ":start\r"
+loader "advent"
+respond "*" ":start\r"
 respond "*" "\032"
-type ":start 45\r"
-respond "Command:" "d"
-respond "*" ":pdump sys3; ts advent\r"
-respond "*" ":kill\r"
+type ":vk\r"
+decuuo "sys3; ts advent"
 
 # 350-point ADVENT
 cwd "games"
@@ -489,17 +486,12 @@ respond "*" "adv3sb=adv3sb\r"
 expect "CORE USED"
 respond "*" "\032"
 type ":kill\r"
-respond "*" ":dec sys:loader\r"
-respond "*" "adv3sb\r"
-respond "*" "adv3sr\r"
-respond "*" "/g\r"
-respond "EXIT" ":start\r"
+loader "adv3sb,adv3sr"
+respond "*" ":start\r"
 respond "*" "adv3db.1"
 respond "*" "\032"
-type ":start 45\r"
-respond "Command:" "d"
-respond "*" ":pdump games; ts adv350\r"
-respond "*" ":kill\r"
+type ":vk\r"
+decuuo "games; ts adv350"
 
 # 448-point ADVENT
 cwd "games"
@@ -509,17 +501,12 @@ respond "*" "adv4su=adv4su\r"
 expect "CORE USED"
 respond "*" "\032"
 type ":kill\r"
-respond "*" ":dec sys:loader\r"
-respond "*" "adv4ma\r"
-respond "*" "adv4su\r"
-respond "*" "/g\r"
-respond "EXIT" ":start\r"
+loader "adv4ma,adv4su"
+respond "*" ":start\r"
 respond "*" "adv4db.2"
 respond "Are you a wizard?" "\032"
-type ":start 45\r"
-respond "Command:" "d"
-respond "*" ":pdump games; ts adv448\r"
-respond "*" ":kill\r"
+type ":vk\r"
+decuuo "games; ts adv448"
 
 # TREK
 cwd "games"
@@ -528,13 +515,8 @@ respond "*" "trek=trek\r"
 expect "CORE USED"
 respond "*" "\032"
 type ":kill\r"
-respond "*" ":dec sys:loader\r"
-respond "*" "trek\r"
-respond "*" "/g\r"
-respond "EXIT" ":start 45\r"
-respond "Command:" "d"
-respond "*" ":pdump games; ts trek\r"
-respond "*" ":kill\r"
+loader "trek"
+decuuo "games; ts trek"
 
 # Tech II chess: timesharing, using TV display
 respond "*" ":midas games;ts chess2_rg;chess2\r"
@@ -620,26 +602,13 @@ respond "*" "macro=macro\r"
 expect "CORE USED"
 respond "*" "\003"
 respond "*" ":kill\r"
-respond "*" ":dec sys:link\r"
-respond "*" "macro/go\r"
-# Strange error here.  Workaround is to retry.
-expect "%LNKNED"
-respond "*" "macro/go\r"
-respond "*" ":start 45\r"
-respond "Command" "d"
-respond "*" ":pdump sys2; ts macro\r"
-respond "*" ":kill\r"
+linker "macro"
+decuuo "sys2; ts macro"
 respond "*" ":delete decsys; macro shr\r"
 # Assemble with itself, now no errors
 macro "macro" "macro"
-respond "*" ":dec sys:link\r"
-respond "*" "macro/go\r"
-expect "%LNKNED"
-respond "*" "macro/go\r"
-respond "*" ":start 45\r"
-respond "Command" "d"
-respond "*" ":pdump sys2; ts macro\r"
-respond "*" ":kill\r"
+linker "macro"
+decuuo "sys2; ts macro"
 
 # MACSYM and MONSYM universal files.
 cwd "decsys"
@@ -652,12 +621,8 @@ macro "uuosym.unv" "uuosym.mac"
 
 # CROSS, assembler
 macro "cross" "cross"
-respond "*" ":dec sys:loader\r"
-respond "*" "cross/g\r"
-respond "*" ":start 45\r"
-respond "Command:" "d"
-respond "*" ":pdump sys1; ts cross\r"
-respond "*" ":kill\r"
+loader "cross"
+decuuo "sys1; ts cross"
 
 # Old PALX
 respond "*" ":midas 11logo;ts palx_rms;palx 143\r"
@@ -670,13 +635,8 @@ respond "*" ":palx live palx\r"
 # MACN11, pdp-11 cross assembler
 cwd "sysen3"
 macro "macn11" "macn11.hdr,macn11.mac"
-respond "*" ":dec sys:loader\r"
-respond "*" "macn11/g\r"
-expect "EXIT"
-respond "*" ":start 45\r"
-respond "Command:" "d"
-respond "*" ":pdump sys3; ts macn11\r"
-respond "*" ":kill\r"
+loader "macn11"
+decuuo "sys3; ts macn11"
 
 # Cookie Bear
 respond "*" ":midas gls; ts check_gls; check\r"
@@ -1640,13 +1600,8 @@ macro "sits.unv" "sits.mac"
 # Datacomputer file transfer.
 cwd "mrc"
 macro "dftp" "dftp"
-respond "*" ":dec sys:link\r"
-respond "*" "dftp/go\r"
-expect "EXIT"
-respond "*" ":start 45\r"
-respond "Command" "d"
-respond "*" ":pdump sys1; ts dftp\r"
-respond "*" ":kill\r"
+linker "dftp"
+decuuo "sys1; ts dftp"
 
 # PDP-11 Lisp.
 respond "*" ":palx rms;_lisp11\r"
@@ -1731,12 +1686,8 @@ expect ":KILL"
 # BBN Logo
 cwd "bbn"
 macro "logo" "logo"
-respond "*" ":dec sys:loader\r"
-respond "*" "logo/g\r"
-respond "EXIT" ":start 45\r"
-respond "Command:" "d"
-respond "*" ":pdump bbn; ts logo\r"
-respond "*" ":kill\r"
+loader "logo"
+decuuo "bbn; ts logo"
 
 # CLOGO
 respond "*" ":midas sys; ts clogo_rjl; logo\r"