From ecc2c2ef4221f62664752d98ad148400ce9794e3 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Mon, 23 Apr 2018 16:10:04 +0100 Subject: [PATCH] Build for ITS, and fix broken ITS/TENEX conditionals. --- src/mudsys/{agc.141 => agc.142} | 2 +- src/mudsys/{interr.425 => interr.426} | 3 ++- src/mudsys/{ldgc.100 => ldgc.101} | 2 ++ src/mudsys/{mappur.162 => mappur.163} | 6 +++++- src/mudsys/{muddle.346 => muddle.347} | 2 +- src/mudsys/{mudsqu.28 => mudsqu.29} | 1 + src/mudsys/{nfree.53 => nfree.54} | 3 ++- src/mudsys/{readch.214 => readch.215} | 2 +- src/mudsys/{utilit.105 => utilit.106} | 6 ++++-- src/mudsys/{uuoh.183 => uuoh.184} | 4 ++++ 10 files changed, 23 insertions(+), 8 deletions(-) rename src/mudsys/{agc.141 => agc.142} (99%) rename src/mudsys/{interr.425 => interr.426} (99%) rename src/mudsys/{ldgc.100 => ldgc.101} (99%) rename src/mudsys/{mappur.162 => mappur.163} (99%) rename src/mudsys/{muddle.346 => muddle.347} (99%) rename src/mudsys/{mudsqu.28 => mudsqu.29} (99%) rename src/mudsys/{nfree.53 => nfree.54} (99%) rename src/mudsys/{readch.214 => readch.215} (99%) rename src/mudsys/{utilit.105 => utilit.106} (99%) rename src/mudsys/{uuoh.183 => uuoh.184} (99%) diff --git a/src/mudsys/agc.141 b/src/mudsys/agc.142 similarity index 99% rename from src/mudsys/agc.141 rename to src/mudsys/agc.142 index a0f2684f..e0d8cdfe 100644 --- a/src/mudsys/agc.141 +++ b/src/mudsys/agc.142 @@ -489,7 +489,7 @@ PURCLS: MOVE P,[-2000,,MRKPDL] MOVE A,INF3 ; GET PTR TO PURIFIED STRUCTURE SKIPN NPRFLG PUSHJ P,%PURIF ; PURIFY - PUSHJ P,%PURMD +IFE ITS, PUSHJ P,%PURMD SETZM GPURFL JRST EPURIF ; FINISH UP diff --git a/src/mudsys/interr.425 b/src/mudsys/interr.426 similarity index 99% rename from src/mudsys/interr.425 rename to src/mudsys/interr.426 index 8e733752..bc0a7a54 100644 --- a/src/mudsys/interr.425 +++ b/src/mudsys/interr.426 @@ -1028,6 +1028,7 @@ RETRLT: MOVE A,(AB) TIMERR: MOVNI A,1 PUSHJ P,TGFALS JRST FINIS +] RLTPER: SKIPGE B,RLTSAV JRST IFALSE @@ -1583,7 +1584,7 @@ IFE ITS, PUSHJ P,TGFALS DIRQ1: SUB TP,[6,,6] JRST DIRQ -] + ; HANDLE INFERIOR KNOCKING AT THE DOOR HINF: diff --git a/src/mudsys/ldgc.100 b/src/mudsys/ldgc.101 similarity index 99% rename from src/mudsys/ldgc.100 rename to src/mudsys/ldgc.101 index d2f1c6a5..a0cc596a 100644 --- a/src/mudsys/ldgc.100 +++ b/src/mudsys/ldgc.101 @@ -481,6 +481,7 @@ ILDBLK: SIXBIT / &DSK/ ] +IFE ITS,[ NDEBUG: SETZM GCDEBU CAIA DEBUGC: SETOM GCDEBU @@ -489,6 +490,7 @@ DEBUGC: SETOM GCDEBU CLOSF JFCL POPJ P, +] IMPURE GCDEBU: 0 diff --git a/src/mudsys/mappur.162 b/src/mudsys/mappur.163 similarity index 99% rename from src/mudsys/mappur.162 rename to src/mudsys/mappur.163 index 416f6e8e..28ccc9c0 100644 --- a/src/mudsys/mappur.162 +++ b/src/mudsys/mappur.163 @@ -337,6 +337,7 @@ FXUPGO: MOVE A,(TP) ; pointer to them IFE ITS,[ SKIPN MULTSG JRST FIXMLT +] HRRZ D,B ; this codes gets us running in the correct ; segment ASH D,PGSHFT @@ -559,8 +560,11 @@ IFE ITS,[ MOVEM 0,P.TOP POPJ P, -EPOPJ: SKIPE MULTSG +EPOPJ: +IFE ITS,[ + SKIPE MULTSG POP P,E +] POPJ P, IFE ITS,[ GETPAX: TDZA B,B ; here if other segs ok diff --git a/src/mudsys/muddle.346 b/src/mudsys/muddle.347 similarity index 99% rename from src/mudsys/muddle.346 rename to src/mudsys/muddle.347 index b52d7f62..cb732d57 100644 --- a/src/mudsys/muddle.346 +++ b/src/mudsys/muddle.347 @@ -335,7 +335,7 @@ NIL"=0 ;END OF LIST MARKER IF1 [ DEFINE SYSQ - ITS==0 + ITS==1 ; IFE <<<.AFNM1>_-24.>->,ITS==0 IFN ITS,[PRINTC /ITS VERSION /] diff --git a/src/mudsys/mudsqu.28 b/src/mudsys/mudsqu.29 similarity index 99% rename from src/mudsys/mudsqu.28 rename to src/mudsys/mudsqu.29 index 17253f61..92e15ad1 100644 --- a/src/mudsys/mudsqu.28 +++ b/src/mudsys/mudsqu.29 @@ -78,6 +78,7 @@ ATOSQ: PUSH P,B IFE ITS,[ SKIPE MULTSG PUSHJ P,@[.+1] ; RUN IN 0 +] MOVE A,SQUPNT ; GET TABLE POINTER MOVE B,[2,,2] CAMN E,1(A) diff --git a/src/mudsys/nfree.53 b/src/mudsys/nfree.54 similarity index 99% rename from src/mudsys/nfree.53 rename to src/mudsys/nfree.54 index be431d4f..dc754685 100644 --- a/src/mudsys/nfree.53 +++ b/src/mudsys/nfree.54 @@ -4,6 +4,7 @@ TITLE MODIFIED AFREE FOR MUDDLE RELOCATABLE .INSRT MUDDLE > +SYSQ .GLOBAL CAFREE,CAFRET,PARNEW,AGC,PARBOT,CODTOP,CAFRE1 .GLOBAL STOGC,STOSTR,CAFRE,ISTOST,STOLST,SAT,ICONS,BYTDOP @@ -139,7 +140,7 @@ CLOOP: CAMG A,(C) ; skip if not big enough CHAVIT: MOVE C,CODTOP MOVE E,PARBOT - PUSHJ P,%CLNCO ; flush extra pages +IFE ITS, PUSHJ P,%CLNCO ; flush extra pages MOVE E,PARBOT ; find amount obtained SUBI E,1 ; dont use a real pair MOVEI C,(E) ; for reset of CODTOP diff --git a/src/mudsys/readch.214 b/src/mudsys/readch.215 similarity index 99% rename from src/mudsys/readch.214 rename to src/mudsys/readch.215 index 385d60da..d6513ec4 100644 --- a/src/mudsys/readch.214 +++ b/src/mudsys/readch.215 @@ -1359,7 +1359,7 @@ IFE ITS,[ IMGOK: MOVE B,IMAGFL EXCH A,B BOUT - +] IMGEXT: MOVSI A,TFIX JRST MPOPJ diff --git a/src/mudsys/utilit.105 b/src/mudsys/utilit.106 similarity index 99% rename from src/mudsys/utilit.105 rename to src/mudsys/utilit.106 index 8b8b6ff4..8a1e94ef 100644 --- a/src/mudsys/utilit.105 +++ b/src/mudsys/utilit.106 @@ -416,9 +416,11 @@ AGC1: SKIPE NPWRIT EXCH P,GCPDL SKIPE SWAPGC JRST IAMSGC - SKIPN MULTSG - JRST IAGC +IFE ITS,[ + SKIPE MULTSG JRST ISECGC +] + JRST IAGC AAGC: SETZM SWAPGC EXCH P,GCPDL diff --git a/src/mudsys/uuoh.183 b/src/mudsys/uuoh.184 similarity index 99% rename from src/mudsys/uuoh.183 rename to src/mudsys/uuoh.184 index ece0dc60..ebda9ef3 100644 --- a/src/mudsys/uuoh.183 +++ b/src/mudsys/uuoh.184 @@ -927,6 +927,7 @@ IFE ITS,[ MOVE 0,UUOH SKIPE MULTSG MOVE 0,MLTPC +] PUSH P,0 ANDI 0,-1 PUSH P,UUOLOC ; SAVE UUO @@ -991,8 +992,11 @@ LOPPOP: POP TP,ACSAV-1(B) LOPBAR: SUB TP,C%11 LOPFOO: SOJG B,LOPPOP JUMPE R,LOPBLT ; OK, NOT RSUBR +IFE ITS,[ SKIPL 1(R) ; NOT PURE RSUBR SKIPN MULTSG +] +IFN ITS, SKIPN 1(R) ; NOT PURE RSUBR JRST LOPBLT MOVE B,M