From bcf2657046fe6c2e854617b4920bb05f27fc09c0 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Sat, 8 Feb 2025 21:08:08 +0100
Subject: [PATCH] Add a "macro10" TCP procedure.

And use it in the build scripts to invoke MACRO-10.
---
 build/build.tcl          |  8 ++++++
 build/kl10/processor.tcl |  6 +----
 build/misc.tcl           | 55 ++++++++--------------------------------
 3 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/build/build.tcl b/build/build.tcl
index c0702c7b..20f7555e 100644
--- a/build/build.tcl
+++ b/build/build.tcl
@@ -173,6 +173,14 @@ proc arpanet {rfc file} {
     }
 }
 
+proc macro10 {target sources} {
+    respond "*" ":macro\r"
+    respond "*" "$target=$sources\r"
+    expect "CORE USED"
+    respond "*" "\003"
+    respond "*" ":kill\r"
+}
+
 set ip [ip_address [lindex $argv 0]]
 set gw [ip_address [lindex $argv 1]]
 
diff --git a/build/kl10/processor.tcl b/build/kl10/processor.tcl
index f0a04e36..9586b68b 100644
--- a/build/kl10/processor.tcl
+++ b/build/kl10/processor.tcl
@@ -46,11 +46,7 @@ copy_to_klfe "ucode;u1 ram"
 
 # KLDDT
 respond "*" ":cwd kldcp\r"
-respond "*" ":macro\r"
-respond "*" "klddt=klddt\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "klddt" "klddt"
 respond "*" ":dec sys:link\r"
 respond "*" "klddt/go\r"
 respond "EXIT" ":start 45\r"
diff --git a/build/misc.tcl b/build/misc.tcl
index 445494c8..23a88c26 100644
--- a/build/misc.tcl
+++ b/build/misc.tcl
@@ -631,11 +631,7 @@ respond "*" ":pdump sys2; ts macro\r"
 respond "*" ":kill\r"
 respond "*" ":delete decsys; macro shr\r"
 # Assemble with itself, now no errors
-respond "*" ":macro\r"
-respond "*" "macro=macro\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "macro" "macro"
 respond "*" ":dec sys:link\r"
 respond "*" "macro/go\r"
 expect "%LNKNED"
@@ -647,35 +643,15 @@ respond "*" ":kill\r"
 
 # MACSYM and MONSYM universal files.
 respond "*" ":cwd decsys\r"
-respond "*" ":macro\r"
-respond "*" "macsym.unv=macsym.mac\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
-respond "*" ":macro\r"
-respond "*" "monsym.unv=monsym.mac\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "macsym.unv" "macsym.mac"
+macro10 "monsym.unv" "monsym.mac"
 
 # MACTEN and UUOSYM universal files.
-respond "*" ":macro\r"
-respond "*" "macten.unv=macten.mac\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
-respond "*" ":macro\r"
-respond "*" "uuosym.unv=uuosym.mac\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "macten.unv" "macten.mac"
+macro10 "uuosym.unv" "uuosym.mac"
 
 # CROSS, assembler
-respond "*" ":macro\r"
-respond "*" "cross=cross\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "cross" "cross"
 respond "*" ":dec sys:loader\r"
 respond "*" "cross/g\r"
 respond "*" ":start 45\r"
@@ -1648,19 +1624,12 @@ expect ":KILL"
 
 # ITS universal file.
 respond "*" ":cwd decsys\r"
-respond "*" ":macro\r"
-respond "*" "sits.unv=sits.mac\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "sits.unv" "sits.mac"
 
 # Datacomputer file transfer.
 respond "*" ":cwd mrc\r"
-respond "*" ":macro\r"
-respond "*" "dftp=dftp\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "dftp" "dftp"
+
 respond "*" ":dec sys:link\r"
 respond "*" "dftp/go\r"
 expect "EXIT"
@@ -1751,11 +1720,7 @@ expect ":KILL"
 
 # BBN Logo
 respond "*" ":cwd bbn\r"
-respond "*" ":macro\r"
-respond "*" "logo=logo\r"
-expect "CORE USED"
-respond "*" "\003"
-respond "*" ":kill\r"
+macro10 "logo" "logo"
 respond "*" ":dec sys:loader\r"
 respond "*" "logo/g\r"
 respond "EXIT" ":start 45\r"