From 188b894795f42ad60280f59a04fcb8c484f5fa4f Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Fri, 28 Dec 2018 11:59:58 +0100
Subject: [PATCH] Fix Lisp display slave when using PDP-10.

---
 src/l/{slave.8 => slave.9} | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
 rename src/l/{slave.8 => slave.9} (99%)

diff --git a/src/l/slave.8 b/src/l/slave.9
similarity index 99%
rename from src/l/slave.8
rename to src/l/slave.9
index af41ebb3..d815d36d 100644
--- a/src/l/slave.8
+++ b/src/l/slave.9
@@ -213,18 +213,8 @@ OPNSIX:	SKIPE SIXOPD
 		  1000,,0		;MY UNAME
 		400000,,[SIXBIT \PDP6\]]	;JNAME=PDP6
 	 JRST OP10
-OP6D2:	SKIPN SIXPG
-	 JRST OP6D2Q
-	MOVEI TT,1
-	PUSHJ P,GETCOR
-	SKIPN TT
-	 LERR [SIXBIT \NO CORE FOR MAPPING DISPLAY SLAVE!\]
-	MOVE D,[-LFOOTBL,,FOOTBL]
-	ADDM TT,(D)
-	AOBJN D,.-1
-	LSH TT,-12
-	MOVEM TT,SIXPG
-OP6D2Q:	.CALL SIXMAP
+OP6D2:	PUSHJ P,SIXCOR
+	.CALL SIXMAP
 	 .VALUE
 OPD62A:	MOVEM R,SIXOPD		;IF OPENING 6, THEN R=-1 WILL ALLOW SECOND TRY
 OP6A:	MOVEI TT,DCLEAR		;R = 0 SAYS TRY 10SLAVE IF NO RESPONSE
@@ -258,6 +248,19 @@ OP6C1:	LERR DERR1
 	MOVEM TT,41(T)
 	AOJA R,OP6A
 
+SIXCOR:	SKIPE SIXPG
+	 POPJ P,
+	MOVEI TT,1
+	PUSHJ P,GETCOR
+	SKIPN TT
+	 LERR [SIXBIT \NO CORE FOR MAPPING DISPLAY SLAVE!\]
+	MOVE D,[-LFOOTBL,,FOOTBL]
+	ADDM TT,(D)
+	AOBJN D,.-1
+	LSH TT,-12
+	MOVEM TT,SIXPG
+	POPJ P,
+
 SIXMAP:	SETZ
 	SIXBIT \CORBLK\			;HACK CORE PAGE
 	  1000,,300000		;READ/WRITE ACCESS
@@ -287,6 +290,7 @@ OPNTEN:	.CALL [	SETZ
 	.CALL LSIXC
 	 .VALUE
 	.CLOSE TMPC,
+	PUSHJ P,SIXCOR
 	.CALL SIXMAP
 	 .VALUE
 	MOVEM F,XARG			;0 => 340 SLAVE, "TNM" => GT40 SLAVE