From 366665e77a3a24bc077dec9340528fe8d5a9136a Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Wed, 9 Sep 2020 03:06:11 +0100 Subject: [PATCH] Fix wrong encoding of \r in Muddle 56 source. Found from comparison with a TS MUD54 binary. The Muddle 56/106 source came from TOPS-20 originally, and it had been extracted with newline conversion but not ITS encoding. Most of these are cosmetic, but there are a couple of VALRET strings with embedded \rs -- including the one used to exit initialisation. So successful initialisation now finishes with a *, rather than opening a random location. --- build/muddle.tcl | 2 +- src/mudsys/agc.131 | 2 +- src/mudsys/fopen.36 | 32 ++++++++++++++++---------------- src/mudsys/initm.372 | 2 +- src/mudsys/mappur.147 | 2 +- src/mudsys/muddle.347 | 2 +- src/mudsys/print.340 | 12 ++++++------ src/mudsys/stenex.11 | 2 +- src/mudsys/utilit.104 | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/muddle.tcl b/build/muddle.tcl index fa0b0655..0332b6c3 100644 --- a/build/muddle.tcl +++ b/build/muddle.tcl @@ -16,7 +16,7 @@ respond "\n" "D\033\033" respond "\n" "strng/\0331\"56^?^?^?\033\r" respond "\n" ":pdump mudsav; ts mud56\r" respond "*" ":start\r" -respond "..PERM/" ":pdump mudsav; ts mdl56\r" +respond "*" ":pdump mudsav; ts mdl56\r" respond "*" ":kill\r" respond "*" ":midas sys3; ts mudinq_sysen2; mudinq\r" diff --git a/src/mudsys/agc.131 b/src/mudsys/agc.131 index e44c5e7f..0e28d5c4 100644 --- a/src/mudsys/agc.131 +++ b/src/mudsys/agc.131 @@ -155,7 +155,7 @@ SPOUT: JUMPE LPVP,DPGC4 ; END OF CHAIN SUBI C,2 ; WE'RE NOT SENDING OUT THE VALUE PAIR HRLM C,(F) ; ADJUSTED LENGTH MOVE 0,C ; COPY C FOR TRBLKX - SUBI E,(C) ; ADJUST PTRS FOR SENDOUT + SUBI E,(C) ; ADJUST PTRS FOR SENDOUTī SUBI F,-1(C) PUSHJ P,TRBLKX ; OUT IT GOES JRST SPOUT diff --git a/src/mudsys/fopen.36 b/src/mudsys/fopen.36 index ffbee311..da0bef55 100644 --- a/src/mudsys/fopen.36 +++ b/src/mudsys/fopen.36 @@ -1637,21 +1637,21 @@ INSTAT: MOVE E,B MOVEM B,(C) ; STORE STATE MOVE B,E POPJ P, - -ITSTRN: MOVEI B,0 - JRST NLOSS - JRST NLOSS - MOVEI B,1 - MOVEI B,2 - JRST NLOSS - MOVEI B,4 - PUSHJ P,NOPND - MOVEI B,0 - JRST NLOSS - JRST NLOSS - PUSHJ P,NCLSD - MOVEI B,0 - JRST NLOSS +ī +ITSTRN: MOVEI B,0ī + JRST NLOSSī + JRST NLOSSī + MOVEI B,1ī + MOVEI B,2ī + JRST NLOSSī + MOVEI B,4ī + PUSHJ P,NOPNDī + MOVEI B,0ī + JRST NLOSSī + JRST NLOSSī + PUSHJ P,NCLSDī + MOVEI B,0ī + JRST NLOSSī MOVEI B,0 NLOSS: FATAL ILLEGAL NETWORK STATE @@ -4243,7 +4243,7 @@ BFCLS1: HRRZ C,DIRECT-1(B) MOVEI A,40 ; PAD WITH SPACES PUSHJ P,PUTCHR XCT (P) ; AOS ACCESS IF NECESSARY - SOJG D,.-3 ; TO END OF WORD + SOJG D,.-3 ; TO END OF WORDī BCLS11: POP P,0 HLLZS ACCESS-1(B) HRRZ C,BUFSTR-1(B) diff --git a/src/mudsys/initm.372 b/src/mudsys/initm.372 index bd8c5293..0b288bd8 100644 --- a/src/mudsys/initm.372 +++ b/src/mudsys/initm.372 @@ -496,7 +496,7 @@ IFE ITS, MOVE C,[HALTF] IFE ITS, SKIPE OPSYS MOVE C,[ASCII \0/9\] MOVE D,[ASCII \B/1Q\] - MOVE E,[ASCIZ \ * \] ;TERMINATE + MOVE E,[ASCIZ \ī*ī\] ;TERMINATE POPJ P, ; GO ; CHECK PAIR SPACE diff --git a/src/mudsys/mappur.147 b/src/mudsys/mappur.147 index 0cd8c0f7..d27122ae 100644 --- a/src/mudsys/mappur.147 +++ b/src/mudsys/mappur.147 @@ -1335,7 +1335,7 @@ NOFXU2: MOVE A,TEMP(P) ; GET BACK POINTER GETIT: HRRZM B,SPAG(P) ; GET BLOCK OF START HLRZM B,FLEN(P) ; DAMMIT SAVE THIS! - HLRZ A,B ; GET LENGTH + HLRZ A,B ; GET LENGTHī IFN ITS,[ .CALL MNBLK PUSHJ P,TRAGN diff --git a/src/mudsys/muddle.347 b/src/mudsys/muddle.347 index cb732d57..5a62de95 100644 --- a/src/mudsys/muddle.347 +++ b/src/mudsys/muddle.347 @@ -991,7 +991,7 @@ TERMIN ; MACRO TO HANDLE FATAL ERRORS DEFINE FATAL MSG/ - FATINS [ASCIZ /: FATAL ERROR MSG  /] + FATINS [ASCIZ /: FATAL ERROR MSG ī/] TERMIN ] diff --git a/src/mudsys/print.340 b/src/mudsys/print.340 index 770b48f7..118e0b5d 100644 --- a/src/mudsys/print.340 +++ b/src/mudsys/print.340 @@ -54,7 +54,7 @@ C.READ==40 GETYP A,2(AB) CAIE A,TFIX JRST WTYP2 ;SECOND ARG NOT FIX THEN LOSE - CAMG AB,[-4,,0] ;SEE IF THERE IS A RADIX ARGUMENT +ī CAMG AB,[-4,,0] ;SEE IF THERE IS A RADIX ARGUMENT JRST .+3 ; RADIX SUPPLIED PUSHJ P,GTRADX ; GET THE RADIX FROM OUTCHAN JRST FLTGO @@ -92,7 +92,7 @@ MFUNCTION UNPARSE,SUBR GETYP 0,2(AB) CAIE 0,TFIX ;SEE IF RADIX IS FIXED JRST WTYP2 - MOVE C,3(AB) ;GET RADIX + MOVE C,3(AB) ;GET RADIXī PUSHJ P,GETARG ;GET ARGS INTO A AND B UNPRGO: PUSHJ P,CIUPRS JRST FINIS @@ -417,20 +417,20 @@ CPCSTR: SUBM M,(P) JRST TPR1E ; EXIT -CPATOM: PUSH TP,A ; COPY ARGS FOR INTERNAL SAKE +CPATOM: PUSH TP,A ; COPY ARGS FOR INTERNAL SAKEī PUSH TP,B PUSH P,0 ; ATOM CALLER ROUTINE PUSH P,C JRST PATOM -CPCHST: PUSH TP,A ; COPY ARGS FOR INTERNAL SAKE +CPCHST: PUSH TP,A ; COPY ARGS FOR INTERNAL SAKEī PUSH TP,B PUSH P,0 ; STRING CALLER ROUTINE PUSH P,C JRST PCHSTR - + ī AGET: MOVEI FLAGS,0 SKIPL E,AB ; COPY ARG POINTER JRST TFA ;NO ARGS IS AN ERROR @@ -802,7 +802,7 @@ PPCODE: MOVEI A,2 MOVE B,-4(TP) ; GET CHANNEL INTO B PUSHJ P,SPACEQ HRRZ B,-2(TP) ; GET OFFSET - MOVSI A,TFIX + MOVSI A,TFIXī PUSHJ P,IPRINT SUB TP,[2,,2] ; POP CHANNEL OFF STACK MOVEI A,"> diff --git a/src/mudsys/stenex.11 b/src/mudsys/stenex.11 index 46f673b4..619f3961 100644 --- a/src/mudsys/stenex.11 +++ b/src/mudsys/stenex.11 @@ -250,7 +250,7 @@ IFE F,[ E=600000+N] IFN F,[ E=600000+N+F_21] -TERMIN +TERMINī ...QQQ LGINX1,10 ...QQQ LGINX2,11 diff --git a/src/mudsys/utilit.104 b/src/mudsys/utilit.104 index 45874ec3..30e041b0 100644 --- a/src/mudsys/utilit.104 +++ b/src/mudsys/utilit.104 @@ -97,7 +97,7 @@ EGCDUM: PUSH P,A ; SAVE LENGTH TRAGN: PUSHJ P,PGFIND ; TRY TO GET PAGES JUMPL B,GCDPLS ; LOSSAGE? POP P,A ; GET # OF PAGES - PUSH P,B ; SAVE B + PUSH P,B ; SAVE Bī MOVNS A ; BUILD AOBJN POINTER HRLZS A ADDI A,FPAG/2000 ; START