args.c
Files args.c and ../args.c are identical
blok.c
*** blok.c	Mon May  2 17:59:57 1994
--- ../blok.c	Wed Apr 27 20:47:53 1994
***************
*** 32,38 ****
  POS             brkincr=BRKINCR;
  BLKPTR          blokp;                  /*current search pointer*/
  #ifndef mpx
! BLKPTR          bloktop=BLK(xend);      /*top of arena (last blok)*/
  #else
  BLKPTR          bloktop=(BLKPTR)(0);    /* start of heap */
  #endif
--- 32,38 ----
  POS             brkincr=BRKINCR;
  BLKPTR          blokp;                  /*current search pointer*/
  #ifndef mpx
! BLKPTR          bloktop=BLK(end);       /*top of arena (last blok)*/
  #else
  BLKPTR          bloktop=(BLKPTR)(0);    /* start of heap */
  #endif
***************
*** 71,78 ****
  #ifdef mpx
          if (bloktop == (BLKPTR)(0)) {
                  BLKPTR temp;
                  bloktop = (BLKPTR)(eas); /* set start of heap */
!                 bloktop->word = BLK(Rcheat(bloktop)+1);
                  temp = bloktop->word = BLK(Rcheat(bloktop+1));
                  stakbot=STK( (Rcheat(bloktop+2) + reqd) );
                  temp->word = (BLKPTR)(0);
--- 71,80 ----
  #ifdef mpx
          if (bloktop == (BLKPTR)(0)) {
                  BLKPTR temp;
+ 
                  bloktop = (BLKPTR)(eas); /* set start of heap */
!                 if (setbrk(reqd) <= 0)error(nospace);
! /*                bloktop->word = BLK(Rcheat(bloktop+1)); */
                  temp = bloktop->word = BLK(Rcheat(bloktop+1));
                  stakbot=STK( (Rcheat(bloktop+2) + reqd) );
                  temp->word = (BLKPTR)(0);
***************
*** 92,101 ****
          blokp=bloktop;
          bloktop=bloktop->word=BLK(Rcheat(bloktop)+reqd);
  #ifndef mpx
!         bloktop->word=BLK(ADR(xend)+1);
  #else
          if (setbrk(reqd) <= 0)error(nospace);
!                 bloktop->word=(BLKPTR)((bloktop)+1);
  #endif
          BEGIN
             REG STKPTR stakadr=STK(bloktop+2);
--- 94,103 ----
          blokp=bloktop;
          bloktop=bloktop->word=BLK(Rcheat(bloktop)+reqd);
  #ifndef mpx
!         bloktop->word=BLK(ADR(end)+1);
  #else
          if (setbrk(reqd) <= 0)error(nospace);
!         bloktop->word=(BLKPTR)(BLK(Rcheat(bloktop+1)+1));
  #endif
          BEGIN
             REG STKPTR stakadr=STK(bloktop+2);
***************
*** 110,120 ****
          REG BLKPTR      p;
  
          IF (p=ap) ANDF p<bloktop
- #ifndef mpx
-         THEN    Lcheat((--p)->word) &= ~BUSY;
- #else
          THEN    (--p)->word = (BLKPTR)(Rcheat(p->word) & ~BUSY);
- #endif
          FI
  }
  
--- 112,118 ----
***************
*** 123,129 ****
          BLKPTR  ptr;
  {
          INT             exf=0;
!         REG BLKPTR      p = xend;
          REG BLKPTR      q;
          INT             us=0, un=0;
  
--- 121,127 ----
          BLKPTR  ptr;
  {
          INT             exf=0;
!         REG BLKPTR      p = end;
          REG BLKPTR      q;
          INT             us=0, un=0;
  
***************
*** 130,136 ****
          LOOP
             q = Rcheat(p->word)&~BUSY;
             IF p==ptr THEN exf++ FI
!            IF q<xend ORF q>bloktop THEN abort(3) FI
             IF p==bloktop THEN break FI
             IF busy(p)
             THEN us += q-p;
--- 128,134 ----
          LOOP
             q = Rcheat(p->word)&~BUSY;
             IF p==ptr THEN exf++ FI
!            IF q<end ORF q>bloktop THEN abort(3) FI
             IF p==bloktop THEN break FI
             IF busy(p)
             THEN us += q-p;
builtin.c
Files builtin.c and ../builtin.c are identical
cmd.c
Files cmd.c and ../cmd.c are identical
ctype.c
Files ctype.c and ../ctype.c are identical
expand.c
*** expand.c	Mon May  2 17:59:58 1994
--- ../expand.c	Wed Apr  6 16:08:14 1994
***************
*** 27,39 ****
   */
  
  #include        "defs.h"
! #include        <types.h>
! #include        <param.h>
! #include        <stat.h>
! #include        <dir.h>
  
  
- 
  /* globals (file name generation)
   *
   * "*" in params matches r.e ".*"
--- 27,38 ----
   */
  
  #include        "defs.h"
! #include        <sys/types.h>
! #include        <sys/param.h>
! #include        <sys/stat.h>
! #include        <dirent.h>
  
  
  /* globals (file name generation)
   *
   * "*" in params matches r.e ".*"
***************
*** 55,61 ****
          STRING          rescan = 0;
          REG STRING      s, cs;
          ARGPTR          schain = gchain;
!         struct direct   *dp;
          STATBUF         statb;
  
          IF trapnote&SIGSET THEN return(0); FI
--- 54,60 ----
          STRING          rescan = 0;
          REG STRING      s, cs;
          ARGPTR          schain = gchain;
!         struct dirent   *dp;
          STATBUF         statb;
  
          IF trapnote&SIGSET THEN return(0); FI
fault.c
*** fault.c	Mon May  2 17:59:58 1994
--- ../fault.c	Wed Apr  6 16:17:24 1994
***************
*** 21,29 ****
  
  #include        "defs.h"
  
- #ifdef mpx
  BOOL    trapnote;
- #endif
  
  STRING          trapcom[MAXTRAP];
  BOOL            trapflg[MAXTRAP]= {
--- 21,27 ----
io.c
*** io.c	Mon May  2 17:59:58 1994
--- ../io.c	Thu Apr 28 09:36:37 1994
***************
*** 22,34 ****
  #include        "defs.h"
  #include        "dup.h"
  
- #ifdef mpx
  /* define the actual storage */
  INT     ioset;
  IOPTR   iotemp;
  IOPTR   iopend;
  INT     stripflg;
- #endif
  
  /* ========     input output and file copying ======== */
  
--- 22,32 ----
***************
*** 88,93 ****
--- 86,92 ----
  {
          REG INT         rc;
  
+ printf("chkopen: %s\n", idf);
          IF (rc=open(idf,0))<0
          THEN    failed(idf,badopen);
          ELSE    return(rc);
macro.c
*** macro.c	Mon May  2 17:59:59 1994
--- ../macro.c	Wed Apr  6 16:17:43 1994
***************
*** 22,34 ****
  #include        "defs.h"
  #include        "sym.h"
  
- #ifdef mpx
  STRING  exitadr;
  STRING  pcsadr;
  STRING  pidadr;
  STRING  dolladr;
  INT     peekc;
- #endif
  
  LOCAL CHAR      quote;  /* used locally */
  LOCAL CHAR      quoted; /* used locally */
--- 22,32 ----
main.c
*** main.c	Mon May  2 17:59:59 1994
--- ../main.c	Wed Apr 27 14:24:26 1994
***************
*** 25,32 ****
  #include        "defs.h"
  #include        "sym.h"
  #include        "timeout.h"
! #include        <types.h>
! #include        <stat.h>
  #include        <termio.h>
  #include        "dup.h"
  
--- 25,32 ----
  #include        "defs.h"
  #include        "sym.h"
  #include        "timeout.h"
! #include        <sys/types.h>
! #include        <sys/stat.h>
  #include        <termio.h>
  #include        "dup.h"
  
***************
*** 38,44 ****
  
  PROC VOID       exfile();
  
- #ifdef mpx
  /* define the actual storage */
  INT     dolc;
  STRING  *dolv;
--- 38,43 ----
***************
*** 54,61 ****
  STRING  comdiv;
  STRING  tmpnam;
  extern  BLKPTR  bloktop;
- #endif
- 
  
  
  main(c, v, e)
--- 53,58 ----
msg.c
Files msg.c and ../msg.c are identical
name.c
Files name.c and ../name.c are identical
print.c
Files print.c and ../print.c are identical
serror.c
Files serror.c and ../serror.c are identical
service.c
*** service.c	Mon May  2 18:00:00 1994
--- ../service.c	Wed Apr  6 16:18:39 1994
***************
*** 21,29 ****
  
  #include        "defs.h"
  
- #ifdef mpx
  INT     wasintr;
- #endif
  
  PROC VOID       gsort();
  
--- 21,27 ----
***************
*** 405,414 ****
                  ELSE    /* assign(&fngnod, argp->argval); */
                          makearg(argp); count++;
                  FI
- #ifndef mpx
-                 Lcheat(gchain) |= ARGMK;
- #else
                  gchain = (ARGPTR) (Rcheat(gchain) | ARGMK);
- #endif
          POOL
  }
--- 403,408 ----
setbrk.c
Files setbrk.c and ../setbrk.c are identical
stak.c
*** stak.c	Mon May  2 18:00:01 1994
--- ../stak.c	Wed Apr  6 16:19:23 1994
***************
*** 21,32 ****
  
  #include        "defs.h"
  
- #ifdef mpx
  STKPTR  stakbas;
  STKPTR  brkend;
  BLKPTR  stakbsy;
  STKPTR  staktop;
- #endif
  
  #ifndef mpx
  STKPTR          stakbot=nullstr;
--- 21,30 ----
***************
*** 34,45 ****
  STKPTR          stakbot=(STKPTR)(0);
  #endif
  
- 
- 
  /* ========     storage allocation      ======== */
  
  STKPTR  getstak(asize)
!         INT             asize;
  {       /* allocate requested stack */
          REG STKPTR      oldstak;
          REG INT         size;
--- 32,41 ----
  STKPTR          stakbot=(STKPTR)(0);
  #endif
  
  /* ========     storage allocation      ======== */
  
  STKPTR  getstak(asize)
! INT             asize;
  {       /* allocate requested stack */
          REG STKPTR      oldstak;
          REG INT         size;
string.c
Files string.c and ../string.c are identical
temp.c
Files temp.c and ../temp.c are identical
test.c
*** test.c	Mon May  2 18:00:01 1994
--- ../test.c	Wed Apr  6 16:02:58 1994
***************
*** 16,23 ****
   */
  
  #include "defs.h"
! #include <types.h>
! #include <stat.h>
  
  INT     ap, ac;
  STRING  *av;
--- 16,23 ----
   */
  
  #include "defs.h"
! #include <sys/types.h>
! #include <sys/stat.h>
  
  INT     ap, ac;
  STRING  *av;
word.c
*** word.c	Mon May  2 18:00:02 1994
--- ../word.c	Wed Apr  6 16:19:50 1994
***************
*** 22,28 ****
  #include        "defs.h"
  #include        "sym.h"
  
- #ifdef mpx
  SYSTAB  wreserved = 0;
  INT     wdval;
  INT     wdnum;
--- 22,27 ----
***************
*** 29,39 ****
  ARGPTR  wdarg;
  INT     wdset;
  BOOL    reserv;
- #endif
  
- 
  /* ========     character handling for command lines    ========*/
- 
  
  word()
  {
--- 28,35 ----
xec.c
*** xec.c	Mon May  2 18:00:02 1994
--- ../xec.c	Wed Apr 27 21:04:31 1994
***************
*** 28,48 ****
  extern  SYSTAB          commands;
  extern  SYSTAB          xcmds;
  
- #ifdef mpx
  INT     exitval;
  BOOL    execbrk;
  INT     loopcnt;
  INT     breakcnt;
- #endif
  
- 
  /* ========     command execution       ========*/
  
- 
  execute(argt, execflg, pf1, pf2)
!         TREPTR          argt;
!         INT             *pf1, *pf2;
! 
  {
          /* `stakbot' is preserved by this routine */
          REG TREPTR      t;
--- 28,43 ----
  extern  SYSTAB          commands;
  extern  SYSTAB          xcmds;
  
  INT     exitval;
  BOOL    execbrk;
  INT     loopcnt;
  INT     breakcnt;
  
  /* ========     command execution       ========*/
  
  execute(argt, execflg, pf1, pf2)
! TREPTR          argt;
! INT             *pf1, *pf2;
  {
          /* `stakbot' is preserved by this routine */
          REG TREPTR      t;
