diff --git a/build/build.tcl b/build/build.tcl index 60ba0049..0912a2ae 100644 --- a/build/build.tcl +++ b/build/build.tcl @@ -183,6 +183,19 @@ proc midast {target source {action ""}} { midas "/t $target" $source $action } +proc omidas {target source {action ""}} { + respond "*" ":midas;324 ${target}_$source\r" + eval $action + expect ":KILL" +} + +proc oomidas {version target source {action ""}} { + respond "*" ":midas;$version\r" + respond "MIDAS.$version" "${target}_$source\r" + eval $action + expect ":KILL" +} + proc macro10 {target sources} { respond "*" ":macro\r" respond "*" "$target=$sources\r" diff --git a/build/ka10/processor.tcl b/build/ka10/processor.tcl index 4c24d44c..83a327d9 100644 --- a/build/ka10/processor.tcl +++ b/build/ka10/processor.tcl @@ -3,21 +3,15 @@ log_progress "ENTERING BUILD SCRIPT: PROCESSOR" # Programs particular to the KA10 processor. # macdmp, PDP-10 hardware read in, with 340 support. -respond "*" ":midas;77\r" -respond "MIDAS.77" ".;MACDMP RIM10_SYSENG; MACDMP MOBY1\r" -expect ":KILL" +oomidas 77 ".;MACDMP RIM10" "SYSENG; MACDMP MOBY1" # macdmp, PDP-6 read in hack. -respond "*" ":midas;77\r" -respond "MIDAS.77" ".;MACDMP RIM2_SYSENG; MACDMP 6U32\r" -expect ":KILL" +oomidas 77 ".;MACDMP RIM2" "SYSENG; MACDMP 6U32" # system gen -respond "*" ":midas;324 dsk0:.;@ sysgen_syseng; system gen\r" -expect ":KILL" +omidas "dsk0:.;@ sysgen" "syseng; system gen" # mark -respond "*" ":midas;324 dsk0:.;@ mark_syseng; mark\r" -expect ":KILL" +omidas "dsk0:.;@ mark" "syseng; mark" # utnam midas "sys3; ts utnam" "lars; utnam" @@ -48,12 +42,9 @@ palx "cons;" "lmcons;ccons" # Old Spacewar cwd "spcwar" -respond "*" ":midas;324 spcwar; war\r" -expect ":KILL" +omidas "spcwar;" "war" midas "spcwar;" "stars" -expect ":KILL" -respond "*" ":midas;324 spcwar; math\r" -expect ":KILL" +omidas "spcwar;" "math" respond "*" ":stink\r" respond "\n" "mspcwar; war\033l\033\033" respond "\n" "mstars\033l\033\033" @@ -64,14 +55,14 @@ respond " " "dsk0:.;@ war\r" respond "*" ":kill\r" # Spacewar, standalone -respond "*" ":midas;324 dsk0:.;@ spcwar_spcwar; spcwar\r" -respond "ITS version" "NO\r" -respond "interrupt" "NO\r" -respond "ships" "\r" -respond "designs" "\r" -respond "suns" "\r" -respond "recording" "\r" -expect ":KILL" +omidas "dsk0:.;@ spcwar" "spcwar; spcwar" { + respond "ITS version" "NO\r" + respond "interrupt" "NO\r" + respond "ships" "\r" + respond "designs" "\r" + respond "suns" "\r" + respond "recording" "\r" +} # Spacewar, timesharing midas "games;ts spcwar" "spcwar; spcwar" { @@ -85,9 +76,9 @@ midas "games;ts spcwar" "spcwar; spcwar" { midas "games;ts dazdrt" "klh; dazdrt" { respond "Run under ITS?" "YES\r" } -respond "*" ":midas;324 dsk0:.;@ dazdrt_klh; dazdrt\r" -respond "Run under ITS?" "NO\r" -expect ":KILL" +omidas "dsk0:.;@ dazdrt" "klh; dazdrt" { + respond "Run under ITS?" "NO\r" +} # Knight TV Spacewar midas "gjd;" "swr data" @@ -140,19 +131,16 @@ midas "sys2;ts munch" "sysen2;munch" midas "dsk0:.;@ titler" "mb; titler" # MLIFE -respond "*" ":midas;324 games;ts mlife_rwg;mlife\r" -expect ":KILL" -respond "*" ":midas;324 /t dsk0:.;@ mlife_rwg;mlife\r" -respond "with ^C" "TS==0\r\003" -expect ":KILL" +omidas "games;ts mlife" "rwg;mlife" +omidas "/t dsk0:.;@ mlife" "rwg;mlife" { + respond "with ^C" "TS==0\r\003" +} # MLIFE -respond "*" ":midas;324 dsk0:.;@ pornis_rwg; pornis\r" -expect ":KILL" +omidas "dsk0:.;@ pornis" "rwg; pornis" # 3406 -respond "*" ":midas;324 dsk0:.;@ 3406_stan.k; 3406\r" -expect ":KILL" +midas "dsk0:.;@ 3406" "stan.k; 3406" # 340D midas "stan.k;mod11 bin" "340d" @@ -176,12 +164,8 @@ respond "*" ":link dsk0: .; @ lorenz, lars; ts lorenz\r" midas "lars; ts tvbrot" "tvbrot" # MUSRUN -respond "*" ":midas;77\r" -respond "MIDAS.77" "SYSBIN;_SYSENG; MUSRUN\r" -expect ":KILL" -respond "*" ":midas;77\r" -respond "MIDAS.77" "SYSBIN;_SYSENG; H10D\r" -expect ":KILL" +oomidas 77 "SYSBIN;" "SYSENG; MUSRUN" +oomidas 77 "SYSBIN;" "SYSENG; H10D" respond "*" ":stink\r" respond "\n" "msysbin; musrun\033l\033\033" respond "\n" "mh10d\033l\033\033" @@ -191,8 +175,7 @@ respond " " "sys1; ts musrun\r" respond "*" ":kill\r" # KA10 maintenance -respond "*" ":midas;324 sys;ts 10run_sysen2; 10run\r" -expect ":KILL" +midas "sys;ts 10run" "sysen2; 10run" # Display all Type 342 characters. midas "dsk0:maint;" "tst342" @@ -239,22 +222,10 @@ expect ":KILL" # NTS TECO-6 cwd ".teco." -respond "*" ":midas;73\r" -expect "MIDAS" -respond "\n" "TECODM REL_TECO DUMMY\r" -expect ":KILL" -respond "*" ":midas;73\r" -expect "MIDAS" -respond "\n" "MACTAP REL_SYSENG;MACTAP F68\r" -expect ":KILL" -respond "*" ":midas;73\r" -expect "MIDAS" -respond "\n" "LPT REL_SYSENG;LPT 11\r" -expect ":KILL" -respond "*" ":midas;73\r" -expect "MIDAS" -respond "\n" "TECO6 REL_.TECO.;TECO6 256K\r" -expect ":KILL" +oomidas 73 "TECODM REL" "TECO DUMMY" +oomidas 73 "MACTAP REL" "SYSENG;MACTAP F68" +oomidas 73 "LPT REL" "SYSENG;LPT 11" +oomidas 73 "TECO6 REL" ".TECO.;TECO6 256K" respond "*" ":mudsys;stink\r" respond "\n" "MTECODM\033L MLPT\033L MMACTAP\033L MTECO6\033L D\033\033" respond "\n" "\033YDSK0:.;@ TECO\r" diff --git a/build/kl10/processor.tcl b/build/kl10/processor.tcl index 61b5610d..78a7bf12 100644 --- a/build/kl10/processor.tcl +++ b/build/kl10/processor.tcl @@ -123,7 +123,7 @@ move_to_klfe ".temp.; ioelev a11" palx "sysbin;" "system;ioelev" { respond "MACHINE NAME =" "MC\r" } # 11BOOT -midas;"324 sys3;ts 11boot" "syseng;11boot" +omidas "sys3;ts 11boot" "syseng;11boot" # Note, must be run with symbols loaded. # Takes IOELEV BIN and KLRUG BIN from the current directory. cwd "sysbin" diff --git a/build/misc.tcl b/build/misc.tcl index 82a4472f..39f70c0e 100644 --- a/build/misc.tcl +++ b/build/misc.tcl @@ -25,21 +25,16 @@ respond "*" ":pdump midas; ts 77\r" respond "*" ":kill\r" # MIDAS 73, bootstrapped from 77. -respond "*" ":midas;77\r" -respond "MIDAS.77" "MIDAS; TS 73_MIDAS; MIDAS 73\r" -respond "*" ":midas;73\r" -respond "MIDAS.73" "MIDAS; TS 73_MIDAS; MIDAS 73\r" +oomidas 77 "MIDAS; TS 73" "MIDAS; MIDAS 73" +oomidas 73 "MIDAS; TS 73" "MIDAS; MIDAS 73" respond "*" ":xfile midas; patch 73\r" expect ":kill" # ITS 138 -respond "*" ":midas;73\r" -respond "MIDAS.73" ".;ITS 138BIN_SYSENG;ITS 138\r" -expect ":KILL" +oomidas 73 ".;ITS 138BIN" "SYSENG;ITS 138" # MACTAP -respond "*" ":midas;324 sysbin;_sysen2; mactap\r" -expect ":KILL" +omidas "sysbin;" "sysen2; mactap" # TECO6 midas "sysbin;teco 335bin" ".teco.; teco 335" @@ -666,8 +661,7 @@ respond "*" "purify\033g" respond "TS @" "\r" respond "*" ":kill\r" -respond "*" ":midas;324 dsk0:.;@ pt_syseng;pt\r" -expect ":KILL" +omidas "dsk0:.;@ pt" "syseng;pt" # PTY midas "sys1;ts pty" "sysen1;pty" @@ -815,21 +809,11 @@ midas "sysbin;" "syseng; muscom" respond "*" ":link sys1;ts muscom, sysbin; muscom bin\r" # BIG -respond "*" ":midas;77\r" -respond "MIDAS.77" "SYSBIN;_SYSENG; BIG\r" -expect ":KILL" -respond "*" ":midas;77\r" -respond "MIDAS.77" "SYSBIN;_PRS; SUDSUD\r" -expect ":KILL" -respond "*" ":midas;77\r" -respond "MIDAS.77" "SYSBIN;_PRS; PLOT\r" -expect ":KILL" -respond "*" ":midas;77\r" -respond "MIDAS.77" "SYSBIN;_PRS; FIGS\r" -expect ":KILL" -respond "*" ":midas;77\r" -respond "MIDAS.77" "SYSBIN;_PRS; SMOLDM\r" -expect ":KILL" +oomidas 77 "SYSBIN;" "SYSENG; BIG" +oomidas 77 "SYSBIN;" "PRS; SUDSUD" +oomidas 77 "SYSBIN;" "PRS; PLOT" +oomidas 77 "SYSBIN;" "PRS; FIGS" +oomidas 77 "SYSBIN;" "PRS; SMOLDM" respond "*" ":stink\r" respond "\n" "msysbin;sudsud\033l\033\033" respond "\n" "mbig\033l\033\033" @@ -1020,8 +1004,7 @@ respond "@" "\021" expect ":KILL" # SSV 22, Imlac scroll saver -respond "*" ":midas;324 sysbin;_imsrc; ssv22\r" -expect ":KILL" +omidas "sysbin;" "imsrc; ssv22" respond "*" ":imtran\r" respond "@" "imlac; ssv22 iml_sysbin; ssv22 bin\r" respond "@" "\021" @@ -1434,8 +1417,7 @@ cwd "gld" palx "gld;" "its" # TORTIS -respond "*" ":midas;324 radia;_tortis\r" -expect ":KILL" +omidas "radia;" "tortis" # BBN Logo cwd "bbn" @@ -1456,10 +1438,7 @@ midas "sys; ts clogo" "rjl; logo" { # NVMIDS, Nova assembler cwd "nova" -respond "*" ":midas;73\r" -expect "MIDAS" -respond "\n" "TS NVMIDS_NVMIDS >\r" -expect ":KILL" +oomidas 73 "TS NVMIDS" "NVMIDS >" # Nova programs. respond "*" ":nvmids\r"