diff --git a/build/sims/config.202 b/build/sims/config.202 index f5af00af..0434a068 100644 --- a/build/sims/config.202 +++ b/build/sims/config.202 @@ -255,6 +255,9 @@ DEFOPT NSTTYS==8 ;# STY'S (PSEUDO-TTY'S) DEFOPT TEN11P==1 ;Rubin 10-11 interface IFDEF TEN11P,IFN TEN11P,DEFSYM T11CPA==3776000 ;ADRS OF TEN-11 CONTROL PAGE +DEFOPT TT11NM==0 ; # of 10-11 PDP11 that handles TV TTYs. +DEFOPT N11TYS==16. ; # PDP11 TV TTYS +DEFOPT MXVBN==40 ; Max video bfr # for assignment purposes. DEFOPT TSYSM==768. ;TOTAL PDP10 1K MEM BLOCKS DEFOPT NMMP==4 ;# EXEC PAGES FOR MMP TABLE (# VIR PGS/512.) diff --git a/build/sims/run b/build/sims/run index 2aea21d6..5dbac46d 100644 --- a/build/sims/run +++ b/build/sims/run @@ -3,13 +3,14 @@ set cpu its set cpu 1024k set cpu idle set cpu mpx -set cpu ten11 set pd off set dpy enabled set tk enabled at tk 10000 set mty enabled at mty 10003 +set ten11 enabled +at ten11 10011 at ptr bin/ka10/boot/dskdmp.rim at dpa0 out/sims/rp03.2 at dpa1 out/sims/rp03.3 diff --git a/build/sims/start b/build/sims/start index 5bf042ed..3fd13553 100755 --- a/build/sims/start +++ b/build/sims/start @@ -1,17 +1,37 @@ #!/bin/sh -gt40() { - trap kill_gt40 0 - (sleep 3; tools/simh/BIN/pdp11 build/sims/gt40 >gt40.log 2>&1) & - GT40="$!" - echo "GT40 started, pid $GT40" +TVCON=${TVCON:--2} + +EXIT=: +trap "" QUIT INT TERM + +started() { + EXIT="$EXIT;stop $1 $2" + trap "$EXIT" EXIT + echo "$1 started, pid $2" } -kill_gt40() { - kill "$GT40" - sleep 1 - kill -9 "$GT40" - echo "GT40 stopped" +stop() { + echo -n "Stopping $1... " + kill "$2" 2> /dev/null + sleep 2 + kill -9 "$2" 2> /dev/null + echo "OK" +} + +gt40() { + (sleep 3; tools/simh/BIN/pdp11 build/sims/gt40 >gt40.log 2>&1) & + 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 @@ -20,3 +40,4 @@ while test -n "$1"; do done tools/sims/BIN/ka10 build/sims/run +exit 0 diff --git a/tools/sims b/tools/sims index f934d88e..40e11301 160000 --- a/tools/sims +++ b/tools/sims @@ -1 +1 @@ -Subproject commit f934d88e0e7f0e1336c0553c2477185d2987a804 +Subproject commit 40e11301cea465ec321993e414ae8f1ecab872ae