projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
put display save area back into formal routine structure
[unix-history] / usr / src / usr.bin / pascal / px / interp.c
diff --git a/usr/src/usr.bin/pascal/px/interp.c b/usr/src/usr.bin/pascal/px/interp.c
index 809d092..b12ff75 100644 (file)
--- a/usr/src/usr.bin/pascal/px/interp.c
+++ b/usr/src/usr.bin/pascal/px/interp.c
@@ -1,8 +1,10 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 
-static char sccsid[] = "@(#)interp.c 1.8 %G%";
+static char sccsid[] = "@(#)interp.c 1.13 %G%";
 
 #include <math.h>
 
 #include <math.h>
+#include "whoami.h"
+#include "objfmt.h"
 #include "vars.h"
 #include "panics.h"
 #include "h02opcs.h"
 #include "vars.h"
 #include "panics.h"
 #include "h02opcs.h"
@@ -19,45 +21,35 @@ long        _lino = 0;
 int    _argc;
 char   **_argv;
 long   _mode;
 int    _argc;
 char   **_argv;
 long   _mode;
-long   _runtst = TRUE;
-long   _nodump = FALSE;
+bool   _runtst = TRUE;
+bool   _nodump = FALSE;
 long   _stlim = 500000;
 long   _stcnt = 0;
 long   _seed = 1;
 long   _stlim = 500000;
 long   _stcnt = 0;
 long   _seed = 1;
+#ifdef VAX
 char   *_minptr = (char *)0x7fffffff;
 char   *_minptr = (char *)0x7fffffff;
+#else
+char   *_minptr = (char *)0xffff;
+#endif VAX
 char   *_maxptr = (char *)0;
 long   *_pcpcount = (long *)0;
 long   _cntrs = 0;
 long   _rtns = 0;
 
 char   *_maxptr = (char *)0;
 long   *_pcpcount = (long *)0;
 long   _cntrs = 0;
 long   _rtns = 0;
 
-/*
- * file record variables
- */
-long           _filefre = PREDEF;
-struct iorechd _fchain = {
-       0, 0, 0, 0,             /* only use fchain field */
-       INPUT                   /* fchain  */
-};
-struct iorec   *_actfile[MAXFILES] = {
-       INPUT,
-       OUTPUT,
-       ERR
-};
-
 /*
  * standard files
  */
 char           _inwin, _outwin, _errwin;
 /*
  * standard files
  */
 char           _inwin, _outwin, _errwin;
-struct iorechd input = {
-       &_inwin,                /* fileptr */
+struct iorechd _err = {
+       &_errwin,               /* fileptr */
        0,                      /* lcount  */
        0x7fffffff,             /* llimit  */
        0,                      /* lcount  */
        0x7fffffff,             /* llimit  */
-       &_iob[0],               /* fbuf    */
-       OUTPUT,                 /* fchain  */
+       &_iob[2],               /* fbuf    */
+       FILNIL,                 /* fchain  */
        STDLVL,                 /* flev    */
        STDLVL,                 /* flev    */
-       "standard input",       /* pfname  */
-       FTEXT | FREAD | SYNC,   /* funit   */
-       0,                      /* fblk    */
+       "Message file",         /* pfname  */
+       FTEXT | FWRITE | EOFF,  /* funit   */
+       2,                      /* fblk    */
        1                       /* fsize   */
 };
 struct iorechd output = {
        1                       /* fsize   */
 };
 struct iorechd output = {
@@ -72,19 +64,33 @@ struct iorechd      output = {
        1,                      /* fblk    */
        1                       /* fsize   */
 };
        1,                      /* fblk    */
        1                       /* fsize   */
 };
-struct iorechd _err = {
-       &_errwin,               /* fileptr */
+struct iorechd input = {
+       &_inwin,                /* fileptr */
        0,                      /* lcount  */
        0x7fffffff,             /* llimit  */
        0,                      /* lcount  */
        0x7fffffff,             /* llimit  */
-       &_iob[2],               /* fbuf    */
-       FILNIL,                 /* fchain  */
+       &_iob[0],               /* fbuf    */
+       OUTPUT,                 /* fchain  */
        STDLVL,                 /* flev    */
        STDLVL,                 /* flev    */
-       "Message file",         /* pfname  */
-       FTEXT | FWRITE | EOFF,  /* funit   */
-       2,                      /* fblk    */
+       "standard input",       /* pfname  */
+       FTEXT | FREAD | SYNC,   /* funit   */
+       0,                      /* fblk    */
        1                       /* fsize   */
 };
 
        1                       /* fsize   */
 };
 
+/*
+ * file record variables
+ */
+long           _filefre = PREDEF;
+struct iorechd _fchain = {
+       0, 0, 0, 0,             /* only use fchain field */
+       INPUT                   /* fchain  */
+};
+struct iorec   *_actfile[MAXFILES] = {
+       INPUT,
+       OUTPUT,
+       ERR
+};
+
 /*
  * Px profile array
  */
 /*
  * Px profile array
  */
@@ -115,7 +121,8 @@ interpreter(base)
        double td, td1;
        struct sze8 t8;
        long *tlp;
        double td, td1;
        struct sze8 t8;
        long *tlp;
-       short *tsp, *tsp1;
+       register short *tsp, *tsp1, ts;
+       bool tb;
        char *tcp1;
        struct stack *tstp;
        struct formalrtn *tfp;
        char *tcp1;
        struct stack *tstp;
        struct formalrtn *tfp;
@@ -137,11 +144,11 @@ interpreter(base)
        /*
         * set up global environment, then ``call'' the main program
         */
        /*
         * set up global environment, then ``call'' the main program
         */
-       _display.frame[0].locvars = pushsp(2 * sizeof(struct iorec *));
-       _display.frame[0].locvars += 8; /* local offsets are negative */
-       *(struct iorec **)(_display.frame[0].locvars - 4) = OUTPUT;
-       *(struct iorec **)(_display.frame[0].locvars - 8) = INPUT;
-       stp = (struct stack *)pushsp(sizeof(struct stack));
+       _display.frame[0].locvars = pushsp((long)(2 * sizeof(struct iorec *)));
+       _display.frame[0].locvars += 2 * sizeof(struct iorec *);
+       *(struct iorec **)(_display.frame[0].locvars + OUTPUT_OFF) = OUTPUT;
+       *(struct iorec **)(_display.frame[0].locvars + INPUT_OFF) = INPUT;
+       stp = (struct stack *)pushsp((long)(sizeof(struct stack)));
        _dp = &_display.frame[0];
        pc.cp = base;
        for(;;) {
        _dp = &_display.frame[0];
        pc.cp = base;
        for(;;) {
@@ -154,9 +161,6 @@ interpreter(base)
                _profcnts[*pc.ucp]++;
 #              endif PROFILE
                switch (*pc.ucp++) {
                _profcnts[*pc.ucp]++;
 #              endif PROFILE
                switch (*pc.ucp++) {
-               default:
-                       panic(PBADOP);
-                       continue;
                case O_NODUMP:
                        _nodump = TRUE;
                        /* and fall through */
                case O_NODUMP:
                        _nodump = TRUE;
                        /* and fall through */
@@ -171,14 +175,15 @@ interpreter(base)
                        disableovrflo();
                        if (_runtst)
                                enableovrflo();
                        disableovrflo();
                        if (_runtst)
                                enableovrflo();
-                       pc.cp += tl;            /* skip over proc hdr info */
+                       pc.cp += (int)tl;       /* skip over proc hdr info */
                        stp->file = curfile;    /* save active file */
                        tcp = pushsp(tl1);      /* tcp = new top of stack */
                        stp->file = curfile;    /* save active file */
                        tcp = pushsp(tl1);      /* tcp = new top of stack */
-                       blkclr(tl1, tcp);       /* zero stack frame */
-                       tcp += tl1;             /* offsets of locals are neg */
+                       if (_runtst)            /* zero stack frame */
+                               blkclr(tl1, tcp);
+                       tcp += (int)tl1;        /* offsets of locals are neg */
                        _dp->locvars = tcp;     /* set new display pointer */
                        _dp->stp = stp;
                        _dp->locvars = tcp;     /* set new display pointer */
                        _dp->stp = stp;
-                       stp->tos = pushsp(0);   /* set top of stack pointer */
+                       stp->tos = pushsp((long)0); /* set tos pointer */
                        continue;
                case O_END:
                        PCLOSE(_dp->locvars);   /* flush & close local files */
                        continue;
                case O_END:
                        PCLOSE(_dp->locvars);   /* flush & close local files */
@@ -203,7 +208,8 @@ interpreter(base)
                        tcp = base + *pc.lp++;/* calc new entry point */
                        tcp += sizeof(short);
                        tcp = base + *(long *)tcp;
                        tcp = base + *pc.lp++;/* calc new entry point */
                        tcp += sizeof(short);
                        tcp = base + *(long *)tcp;
-                       stp = (struct stack *)pushsp(sizeof(struct stack));
+                       stp = (struct stack *)
+                               pushsp((long)(sizeof(struct stack)));
                        stp->lino = _lino;      /* save lino, pc, dp */
                        stp->pc.cp = pc.cp;
                        stp->dp = _dp;
                        stp->lino = _lino;      /* save lino, pc, dp */
                        stp->pc.cp = pc.cp;
                        stp->dp = _dp;
@@ -211,58 +217,49 @@ interpreter(base)
                        pc.cp = tcp;
                        continue;
                case O_FCALL:
                        pc.cp = tcp;
                        continue;
                case O_FCALL:
-                       tl = *pc.cp++;          /* tl = number of args */
-                       if (tl == 0)
-                               tl = *pc.lp++;
+                       pc.cp++;
                        tfp = (struct formalrtn *)popaddr();
                        tfp = (struct formalrtn *)popaddr();
-                       stp = (struct stack *)pushsp(sizeof(struct stack));
+                       stp = (struct stack *)
+                               pushsp((long)(sizeof(struct stack)));
                        stp->lino = _lino;      /* save lino, pc, dp */
                        stp->pc.cp = pc.cp;
                        stp->dp = _dp;
                        stp->lino = _lino;      /* save lino, pc, dp */
                        stp->pc.cp = pc.cp;
                        stp->dp = _dp;
-                       pc.cp = tfp->entryaddr; /* calc new entry point */
-                       if (_runtst) {
-                               tpc.sp = pc.sp + 1;
-                               tl -= tpc.hdrp->nargs;
-                               if (tl != 0) {
-                                       if (tl > 0)
-                                               tl += sizeof(int) - 1;
-                                       else
-                                               tl -= sizeof(int) - 1;
-                                       ERROR(ENARGS, tl / sizeof(int));
-                               }
-                       }
-                       _dp = &_display.frame[tfp->cbn];/* new display ptr */
-                       blkcpy(sizeof(struct disp) * tfp->cbn,
-                               &_display.frame[1], &tfp->disp[tfp->cbn]);
-                       blkcpy(sizeof(struct disp) * tfp->cbn,
-                               &tfp->disp[0], &_display.frame[1]);
+                       pc.cp = tfp->fentryaddr;/* calc new entry point */
+                       _dp = &_display.frame[tfp->fbn];/* new display ptr */
+                       blkcpy(tfp->fbn * sizeof(struct disp),
+                               &_display.frame[1], &tfp->fdisp[tfp->fbn]);
+                       blkcpy(tfp->fbn * sizeof(struct disp),
+                               &tfp->fdisp[0], &_display.frame[1]);
                        continue;
                case O_FRTN:
                        tl = *pc.cp++;          /* tl = size of return obj */
                        if (tl == 0)
                                tl = *pc.usp++;
                        continue;
                case O_FRTN:
                        tl = *pc.cp++;          /* tl = size of return obj */
                        if (tl == 0)
                                tl = *pc.usp++;
-                       tcp = pushsp(0);
+                       tcp = pushsp((long)(0));
                        tfp = *(struct formalrtn **)(tcp + tl);
                        tfp = *(struct formalrtn **)(tcp + tl);
-                       blkcpy(tl, tcp, tcp + sizeof(struct formalrtn *));
-                       popsp(sizeof(struct formalrtn *));
-                       blkcpy(sizeof(struct disp) * tfp->cbn,
-                               &tfp->disp[tfp->cbn], &_display.frame[1]);
+                       if (tl != 0) {
+                               blkcpy(tl, tcp,
+                                   tcp + sizeof(struct formalrtn *));
+                       }
+                       popsp((long)(sizeof(struct formalrtn *)));
+                       blkcpy(tfp->fbn * sizeof(struct disp),
+                           &tfp->fdisp[tfp->fbn], &_display.frame[1]);
                        continue;
                case O_FSAV:
                        tfp = (struct formalrtn *)popaddr();
                        continue;
                case O_FSAV:
                        tfp = (struct formalrtn *)popaddr();
-                       tfp->cbn = *pc.cp++;    /* blk number of routine */
-                       tcp = base + *pc.lp++;/* calc new entry point */
+                       tfp->fbn = *pc.cp++;    /* blk number of routine */
+                       tcp = base + *pc.lp++;  /* calc new entry point */
                        tcp += sizeof(short);
                        tcp += sizeof(short);
-                       tfp->entryaddr = base + *(long *)tcp;
-                       blkcpy(sizeof(struct disp) * tfp->cbn,
-                               &_display.frame[1], &tfp->disp[0]);
+                       tfp->fentryaddr = base + *(long *)tcp;
+                       blkcpy(tfp->fbn * sizeof(struct disp),
+                               &_display.frame[1], &tfp->fdisp[0]);
                        pushaddr(tfp);
                        continue;
                case O_SDUP2:
                        pc.cp++;
                        tl = pop2();
                        pushaddr(tfp);
                        continue;
                case O_SDUP2:
                        pc.cp++;
                        tl = pop2();
-                       push2(tl);
-                       push2(tl);
+                       push2((short)(tl));
+                       push2((short)(tl));
                        continue;
                case O_SDUP4:
                        pc.cp++;
                        continue;
                case O_SDUP4:
                        pc.cp++;
@@ -293,15 +290,19 @@ interpreter(base)
                                stp = _dp->stp;
                        }
                        /* pop locals, stack frame, parms, and return values */
                                stp = _dp->stp;
                        }
                        /* pop locals, stack frame, parms, and return values */
-                       popsp(stp->tos - pushsp(0));
+                       popsp((long)(stp->tos - pushsp((long)(0))));
                        continue;
                case O_LINO:
                        continue;
                case O_LINO:
-                       if (_dp->stp->tos != pushsp(0))
+                       if (_dp->stp->tos != pushsp((long)(0)))
                                panic(PSTKNEMP);
                        _lino = *pc.cp++;       /* set line number */
                        if (_lino == 0)
                                _lino = *pc.sp++;
                                panic(PSTKNEMP);
                        _lino = *pc.cp++;       /* set line number */
                        if (_lino == 0)
                                _lino = *pc.sp++;
-                       LINO();                 /* inc statement count */
+                       if (_runtst) {
+                               LINO();         /* inc statement count */
+                               continue;
+                       }
+                       _stcnt++;
                        continue;
                case O_PUSH:
                        tl = *pc.cp++;
                        continue;
                case O_PUSH:
                        tl = *pc.cp++;
@@ -309,7 +310,8 @@ interpreter(base)
                                tl = *pc.usp++;
                        tl = (-tl + 1) & ~1;
                        tcp = pushsp(tl);
                                tl = *pc.usp++;
                        tl = (-tl + 1) & ~1;
                        tcp = pushsp(tl);
-                       blkclr(tl, tcp);
+                       if (_runtst)
+                               blkclr(tl, tcp);
                        continue;
                case O_IF:
                        pc.cp++;
                        continue;
                case O_IF:
                        pc.cp++;
@@ -363,62 +365,62 @@ interpreter(base)
                        tl2 = *pc.cp++;         /* tc has jump opcode */
                        tl = *pc.usp++;         /* tl has comparison length */
                        tl1 = (tl + 1) & ~1;    /* tl1 has arg stack length */
                        tl2 = *pc.cp++;         /* tc has jump opcode */
                        tl = *pc.usp++;         /* tl has comparison length */
                        tl1 = (tl + 1) & ~1;    /* tl1 has arg stack length */
-                       tcp = pushsp(0);        /* tcp pts to first arg */
+                       tcp = pushsp((long)(0));/* tcp pts to first arg */
                        switch (tl2) {
                        case releq:
                        switch (tl2) {
                        case releq:
-                               tl = RELEQ(tl, tcp + tl1, tcp);
+                               tb = RELEQ(tl, tcp + tl1, tcp);
                                break;
                        case relne:
                                break;
                        case relne:
-                               tl = RELNE(tl, tcp + tl1, tcp);
+                               tb = RELNE(tl, tcp + tl1, tcp);
                                break;
                        case rellt:
                                break;
                        case rellt:
-                               tl = RELSLT(tl, tcp + tl1, tcp);
+                               tb = RELSLT(tl, tcp + tl1, tcp);
                                break;
                        case relgt:
                                break;
                        case relgt:
-                               tl = RELSGT(tl, tcp + tl1, tcp);
+                               tb = RELSGT(tl, tcp + tl1, tcp);
                                break;
                        case relle:
                                break;
                        case relle:
-                               tl = RELSLE(tl, tcp + tl1, tcp);
+                               tb = RELSLE(tl, tcp + tl1, tcp);
                                break;
                        case relge:
                                break;
                        case relge:
-                               tl = RELSGE(tl, tcp + tl1, tcp);
+                               tb = RELSGE(tl, tcp + tl1, tcp);
                                break;
                        default:
                                panic(PSYSTEM);
                                break;
                        }
                        popsp(tl1 << 1);
                                break;
                        default:
                                panic(PSYSTEM);
                                break;
                        }
                        popsp(tl1 << 1);
-                       push2(tl);
+                       push2((short)(tb));
                        continue;
                case O_RELT:
                        tl2 = *pc.cp++;         /* tc has jump opcode */
                        tl1 = *pc.usp++;        /* tl1 has comparison length */
                        continue;
                case O_RELT:
                        tl2 = *pc.cp++;         /* tc has jump opcode */
                        tl1 = *pc.usp++;        /* tl1 has comparison length */
-                       tcp = pushsp(0);        /* tcp pts to first arg */
+                       tcp = pushsp((long)(0));/* tcp pts to first arg */
                        switch (tl2) {
                        case releq:
                        switch (tl2) {
                        case releq:
-                               tl = RELEQ(tl1, tcp + tl1, tcp);
+                               tb = RELEQ(tl1, tcp + tl1, tcp);
                                break;
                        case relne:
                                break;
                        case relne:
-                               tl = RELNE(tl1, tcp + tl1, tcp);
+                               tb = RELNE(tl1, tcp + tl1, tcp);
                                break;
                        case rellt:
                                break;
                        case rellt:
-                               tl = RELTLT(tl1, tcp + tl1, tcp);
+                               tb = RELTLT(tl1, tcp + tl1, tcp);
                                break;
                        case relgt:
                                break;
                        case relgt:
-                               tl = RELTGT(tl1, tcp + tl1, tcp);
+                               tb = RELTGT(tl1, tcp + tl1, tcp);
                                break;
                        case relle:
                                break;
                        case relle:
-                               tl = RELTLE(tl1, tcp + tl1, tcp);
+                               tb = RELTLE(tl1, tcp + tl1, tcp);
                                break;
                        case relge:
                                break;
                        case relge:
-                               tl = RELTGE(tl1, tcp + tl1, tcp);
+                               tb = RELTGE(tl1, tcp + tl1, tcp);
                                break;
                        default:
                                panic(PSYSTEM);
                                break;
                        }
                        popsp(tl1 << 1);
                                break;
                        default:
                                panic(PSYSTEM);
                                break;
                        }
                        popsp(tl1 << 1);
-                       push2(tl);
+                       push2((short)(tb));
                        continue;
                case O_REL28:
                        td = pop2();
                        continue;
                case O_REL28:
                        td = pop2();
@@ -525,7 +527,7 @@ interpreter(base)
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl1 = (tl + 1) & ~1;
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl1 = (tl + 1) & ~1;
-                       tcp = pushsp(0);
+                       tcp = pushsp((long)(0));
                        blkcpy(tl, tcp, *(char **)(tcp + tl1));
                        popsp(tl1 + sizeof(char *));
                        continue;
                        blkcpy(tl, tcp, *(char **)(tcp + tl1));
                        popsp(tl1 + sizeof(char *));
                        continue;
@@ -565,7 +567,7 @@ interpreter(base)
                        tl = *pc.cp++;
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl = *pc.cp++;
                        if (tl == 0)
                                tl = *pc.usp++;
-                       push4(pop4() + tl);
+                       pushaddr(popaddr() + tl);
                        continue;
                case O_NIL:
                        pc.cp++;
                        continue;
                case O_NIL:
                        pc.cp++;
@@ -573,7 +575,7 @@ interpreter(base)
                        continue;
                case O_ADD2:
                        pc.cp++;
                        continue;
                case O_ADD2:
                        pc.cp++;
-                       push4(pop2() + pop2());
+                       push4((long)(pop2() + pop2()));
                        continue;
                case O_ADD4:
                        pc.cp++;
                        continue;
                case O_ADD4:
                        pc.cp++;
@@ -651,7 +653,7 @@ interpreter(base)
                        continue;
                case O_MUL2:
                        pc.cp++;
                        continue;
                case O_MUL2:
                        pc.cp++;
-                       push4(pop2() * pop2());
+                       push4((long)(pop2() * pop2()));
                        continue;
                case O_MUL4:
                        pc.cp++;
                        continue;
                case O_MUL4:
                        pc.cp++;
@@ -700,7 +702,7 @@ interpreter(base)
                        continue;
                case O_NEG2:
                        pc.cp++;
                        continue;
                case O_NEG2:
                        pc.cp++;
-                       push4(-pop2());
+                       push4((long)(-pop2()));
                        continue;
                case O_NEG4:
                        pc.cp++;
                        continue;
                case O_NEG4:
                        pc.cp++;
@@ -770,7 +772,7 @@ interpreter(base)
                        continue;
                case O_STOI:
                        pc.cp++;
                        continue;
                case O_STOI:
                        pc.cp++;
-                       push4(pop2());
+                       push4((long)(pop2()));
                        continue;
                case O_STOD:
                        pc.cp++;
                        continue;
                case O_STOD:
                        pc.cp++;
@@ -784,7 +786,7 @@ interpreter(base)
                        continue;
                case O_ITOS:
                        pc.cp++;
                        continue;
                case O_ITOS:
                        pc.cp++;
-                       push2(pop4());
+                       push2((short)(pop4()));
                        continue;
                case O_DVD2:
                        pc.cp++;
                        continue;
                case O_DVD2:
                        pc.cp++;
@@ -828,11 +830,11 @@ interpreter(base)
                        continue;
                case O_RV1:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_RV1:
                        tcp = _display.raw[*pc.ucp++];
-                       push2(*(tcp + *pc.sp++));
+                       push2((short)(*(tcp + *pc.sp++)));
                        continue;
                case O_RV14:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_RV14:
                        tcp = _display.raw[*pc.ucp++];
-                       push4(*(tcp + *pc.sp++));
+                       push4((long)(*(tcp + *pc.sp++)));
                        continue;
                case O_RV2:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_RV2:
                        tcp = _display.raw[*pc.ucp++];
@@ -840,7 +842,7 @@ interpreter(base)
                        continue;
                case O_RV24:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_RV24:
                        tcp = _display.raw[*pc.ucp++];
-                       push4(*(short *)(tcp + *pc.sp++));
+                       push4((long)(*(short *)(tcp + *pc.sp++)));
                        continue;
                case O_RV4:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_RV4:
                        tcp = _display.raw[*pc.ucp++];
@@ -863,11 +865,11 @@ interpreter(base)
                        continue;
                case O_LRV1:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_LRV1:
                        tcp = _display.raw[*pc.ucp++];
-                       push2(*(tcp + *pc.lp++));
+                       push2((short)(*(tcp + *pc.lp++)));
                        continue;
                case O_LRV14:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_LRV14:
                        tcp = _display.raw[*pc.ucp++];
-                       push4(*(tcp + *pc.lp++));
+                       push4((long)(*(tcp + *pc.lp++)));
                        continue;
                case O_LRV2:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_LRV2:
                        tcp = _display.raw[*pc.ucp++];
@@ -875,7 +877,7 @@ interpreter(base)
                        continue;
                case O_LRV24:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_LRV24:
                        tcp = _display.raw[*pc.ucp++];
-                       push4(*(short *)(tcp + *pc.lp++));
+                       push4((long)(*(short *)(tcp + *pc.lp++)));
                        continue;
                case O_LRV4:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_LRV4:
                        tcp = _display.raw[*pc.ucp++];
@@ -887,9 +889,9 @@ interpreter(base)
                        continue;
                case O_LRV:
                        tcp = _display.raw[*pc.ucp++];
                        continue;
                case O_LRV:
                        tcp = _display.raw[*pc.ucp++];
-                       tcp += *pc.lp++;
+                       tcp += (int)*pc.lp++;
                        tl = *pc.usp++;
                        tl = *pc.usp++;
-                       tcp1 = pushsp(tl);
+                       tcp1 = pushsp((tl + 1) & ~1);
                        blkcpy(tl, tcp, tcp1);
                        continue;
                case O_LLV:
                        blkcpy(tl, tcp, tcp1);
                        continue;
                case O_LLV:
@@ -898,11 +900,11 @@ interpreter(base)
                        continue;
                case O_IND1:
                        pc.cp++;
                        continue;
                case O_IND1:
                        pc.cp++;
-                       push2(*popaddr());
+                       push2((short)(*popaddr()));
                        continue;
                case O_IND14:
                        pc.cp++;
                        continue;
                case O_IND14:
                        pc.cp++;
-                       push4(*popaddr());
+                       push4((long)(*popaddr()));
                        continue;
                case O_IND2:
                        pc.cp++;
                        continue;
                case O_IND2:
                        pc.cp++;
@@ -910,7 +912,7 @@ interpreter(base)
                        continue;
                case O_IND24:
                        pc.cp++;
                        continue;
                case O_IND24:
                        pc.cp++;
-                       push4(*(short *)(popaddr()));
+                       push4((long)(*(short *)(popaddr())));
                        continue;
                case O_IND4:
                        pc.cp++;
                        continue;
                case O_IND4:
                        pc.cp++;
@@ -929,10 +931,10 @@ interpreter(base)
                        blkcpy(tl, tcp, tcp1);
                        continue;
                case O_CON1:
                        blkcpy(tl, tcp, tcp1);
                        continue;
                case O_CON1:
-                       push2(*pc.cp++);
+                       push2((short)(*pc.cp++));
                        continue;
                case O_CON14:
                        continue;
                case O_CON14:
-                       push4(*pc.cp++);
+                       push4((long)(*pc.cp++));
                        continue;
                case O_CON2:
                        pc.cp++;
                        continue;
                case O_CON2:
                        pc.cp++;
@@ -940,7 +942,7 @@ interpreter(base)
                        continue;
                case O_CON24:
                        pc.cp++;
                        continue;
                case O_CON24:
                        pc.cp++;
-                       push4(*pc.sp++);
+                       push4((long)(*pc.sp++));
                        continue;
                case O_CON4:
                        pc.cp++;
                        continue;
                case O_CON4:
                        pc.cp++;
@@ -948,7 +950,7 @@ interpreter(base)
                        continue;
                case O_CON8:
                        pc.cp++;
                        continue;
                case O_CON8:
                        pc.cp++;
-                       push8(*pc.dp++);
+                       push8(*pc.dbp++);
                        continue;
                case O_CON:
                        tl = *pc.cp++;
                        continue;
                case O_CON:
                        tl = *pc.cp++;
@@ -957,7 +959,16 @@ interpreter(base)
                        tl = (tl + 1) & ~1;
                        tcp = pushsp(tl);
                        blkcpy(tl, pc.cp, tcp);
                        tl = (tl + 1) & ~1;
                        tcp = pushsp(tl);
                        blkcpy(tl, pc.cp, tcp);
-                       pc.cp += tl;
+                       pc.cp += (int)tl;
+                       continue;
+               case O_CONG:
+                       tl = *pc.cp++;
+                       if (tl == 0)
+                               tl = *pc.usp++;
+                       tl1 = (tl + 1) & ~1;
+                       tcp = pushsp(tl1);
+                       blkcpy(tl1, pc.cp, tcp);
+                       pc.cp += (int)((tl + 2) & ~1);
                        continue;
                case O_LVCON:
                        tl = *pc.cp++;
                        continue;
                case O_LVCON:
                        tl = *pc.cp++;
@@ -965,14 +976,14 @@ interpreter(base)
                                tl = *pc.usp++;
                        tl = (tl + 1) & ~1;
                        pushaddr(pc.cp);
                                tl = *pc.usp++;
                        tl = (tl + 1) & ~1;
                        pushaddr(pc.cp);
-                       pc.cp += tl;
+                       pc.cp += (int)tl;
                        continue;
                case O_RANG2:
                        tl = *pc.cp++;
                        if (tl == 0)
                                tl = *pc.sp++;
                        tl1 = pop2();
                        continue;
                case O_RANG2:
                        tl = *pc.cp++;
                        if (tl == 0)
                                tl = *pc.sp++;
                        tl1 = pop2();
-                       push2(RANG4(tl1, tl, *pc.sp++));
+                       push2((short)(RANG4(tl1, tl, *pc.sp++)));
                        continue;
                case O_RANG42:
                        tl = *pc.cp++;
                        continue;
                case O_RANG42:
                        tl = *pc.cp++;
@@ -986,7 +997,7 @@ interpreter(base)
                        if (tl == 0)
                                tl = *pc.sp++;
                        tl1 = pop2();
                        if (tl == 0)
                                tl = *pc.sp++;
                        tl1 = pop2();
-                       push2(RSNG4(tl1, tl));
+                       push2((short)(RSNG4(tl1, tl)));
                        continue;
                case O_RSNG42:
                        tl = *pc.cp++;
                        continue;
                case O_RSNG42:
                        tl = *pc.cp++;
@@ -1005,7 +1016,7 @@ interpreter(base)
                        pc.cp++;
                        tl = *pc.lp++;
                        tl1 = pop2();
                        pc.cp++;
                        tl = *pc.lp++;
                        tl1 = pop2();
-                       push2(RANG4(tl1, tl, *pc.lp++));
+                       push2((short)(RANG4(tl1, tl, *pc.lp++)));
                        continue;
                case O_RSNG4:
                        pc.cp++;
                        continue;
                case O_RSNG4:
                        pc.cp++;
@@ -1015,20 +1026,20 @@ interpreter(base)
                case O_RSNG24:
                        pc.cp++;
                        tl = pop2();
                case O_RSNG24:
                        pc.cp++;
                        tl = pop2();
-                       push2(RSNG4(tl, *pc.lp++));
+                       push2((short)(RSNG4(tl, *pc.lp++)));
                        continue;
                case O_STLIM:
                        pc.cp++;
                        STLIM();
                        continue;
                case O_STLIM:
                        pc.cp++;
                        STLIM();
-                       popargs(1);
+                       popsp((long)(sizeof(long)));
                        continue;
                case O_LLIMIT:
                        pc.cp++;
                        LLIMIT();
                        continue;
                case O_LLIMIT:
                        pc.cp++;
                        LLIMIT();
-                       popargs(2);
+                       popsp((long)(sizeof(char *)+sizeof(long)));
                        continue;
                case O_BUFF:
                        continue;
                case O_BUFF:
-                       BUFF(*pc.cp++);
+                       BUFF((long)(*pc.cp++));
                        continue;
                case O_HALT:
                        pc.cp++;
                        continue;
                case O_HALT:
                        pc.cp++;
@@ -1038,7 +1049,7 @@ interpreter(base)
                        pc.cp++;
                        _cntrs = *pc.lp++;
                        _rtns = *pc.lp++;
                        pc.cp++;
                        _cntrs = *pc.lp++;
                        _rtns = *pc.lp++;
-                       _pcpcount = (long *)calloc(_cntrs + 1, sizeof(long));
+                       NEWZ(&_pcpcount, (_cntrs + 1) * sizeof(long));
                        continue;
                case O_COUNT:
                        pc.cp++;
                        continue;
                case O_COUNT:
                        pc.cp++;
@@ -1090,7 +1101,7 @@ interpreter(base)
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
-                       tcp = pushsp(0);        /* tcp pts to first arg */
+                       tcp = pushsp((long)(0));/* tcp pts to first arg */
                        ADDT(tcp + tl, tcp + tl, tcp, tl >> 2);
                        popsp(tl);
                        continue;
                        ADDT(tcp + tl, tcp + tl, tcp, tl >> 2);
                        popsp(tl);
                        continue;
@@ -1098,7 +1109,7 @@ interpreter(base)
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
-                       tcp = pushsp(0);        /* tcp pts to first arg */
+                       tcp = pushsp((long)(0));/* tcp pts to first arg */
                        SUBT(tcp + tl, tcp + tl, tcp, tl >> 2);
                        popsp(tl);
                        continue;
                        SUBT(tcp + tl, tcp + tl, tcp, tl >> 2);
                        popsp(tl);
                        continue;
@@ -1106,7 +1117,7 @@ interpreter(base)
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
-                       tcp = pushsp(0);        /* tcp pts to first arg */
+                       tcp = pushsp((long)(0));/* tcp pts to first arg */
                        MULT(tcp + tl, tcp + tl, tcp, tl >> 2);
                        popsp(tl);
                        continue;
                        MULT(tcp + tl, tcp + tl, tcp, tl >> 2);
                        popsp(tl);
                        continue;
@@ -1114,46 +1125,47 @@ interpreter(base)
                        tl = *pc.cp++;          /* tl has number of args */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl = *pc.cp++;          /* tl has number of args */
                        if (tl == 0)
                                tl = *pc.usp++;
-                       tl1 = INCT();
-                       popargs(tl);
-                       push2(tl1);
+                       tb = INCT();
+                       popsp(tl*sizeof(long));
+                       push2((short)(tb));
                        continue;
                case O_CTTOT:
                        tl = *pc.cp++;          /* tl has number of args */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl1 = tl * sizeof(long);
                        continue;
                case O_CTTOT:
                        tl = *pc.cp++;          /* tl has number of args */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl1 = tl * sizeof(long);
-                       tcp = pushsp(0) + tl1;  /* tcp pts to result space */
+                       tcp = pushsp((long)(0)) + tl1; /* tcp pts to result */
                        CTTOT(tcp);
                        CTTOT(tcp);
-                       popargs(tl);
+                       popsp(tl*sizeof(long));
                        continue;
                case O_CARD:
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
                        continue;
                case O_CARD:
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
-                       tcp = pushsp(0);        /* tcp pts to set */
+                       tcp = pushsp((long)(0));/* tcp pts to set */
                        tl1 = CARD(tcp, tl);
                        popsp(tl);
                        tl1 = CARD(tcp, tl);
                        popsp(tl);
-                       push2(tl1);
+                       push2((short)(tl1));
                        continue;
                case O_IN:
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl1 = pop4();           /* tl1 is the element */
                        continue;
                case O_IN:
                        tl = *pc.cp++;          /* tl has comparison length */
                        if (tl == 0)
                                tl = *pc.usp++;
                        tl1 = pop4();           /* tl1 is the element */
-                       tcp = pushsp(0);        /* tcp pts to set */
+                       tcp = pushsp((long)(0));/* tcp pts to set */
                        tl2 = *pc.usp++;        /* lower bound */
                        tl2 = *pc.usp++;        /* lower bound */
-                       tl1 = IN(tl1, tl2, *pc.usp++, tcp);
+                       tb = IN(tl1, tl2, (long)(*pc.usp++), tcp);
                        popsp(tl);
                        popsp(tl);
-                       push2(tl1);
+                       push2((short)(tb));
                        continue;
                case O_ASRT:
                        pc.cp++;
                        continue;
                case O_ASRT:
                        pc.cp++;
-                       ASRT(pop2(), "");
+                       ts = pop2();
+                       ASRT(ts, "");
                        continue;
                case O_FOR1U:
                        pc.cp++;
                        continue;
                case O_FOR1U:
                        pc.cp++;
-                       tcp = (char *)pop4();   /* tcp = ptr to index var */
+                       tcp = popaddr();        /* tcp = ptr to index var */
                        if (*tcp < pop4()) {    /* still going up */
                                tl = *tcp + 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
                        if (*tcp < pop4()) {    /* still going up */
                                tl = *tcp + 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
@@ -1168,7 +1180,7 @@ interpreter(base)
                        continue;
                case O_FOR2U:
                        pc.cp++;
                        continue;
                case O_FOR2U:
                        pc.cp++;
-                       tsp = (short *)pop4();  /* tsp = ptr to index var */
+                       tsp = (short *)popaddr(); /* tsp = ptr to index var */
                        if (*tsp < pop4()) {    /* still going up */
                                tl = *tsp + 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
                        if (*tsp < pop4()) {    /* still going up */
                                tl = *tsp + 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
@@ -1183,7 +1195,7 @@ interpreter(base)
                        continue;
                case O_FOR4U:
                        pc.cp++;
                        continue;
                case O_FOR4U:
                        pc.cp++;
-                       tlp = (long *)pop4();   /* tlp = ptr to index var */
+                       tlp = (long *)popaddr(); /* tlp = ptr to index var */
                        if (*tlp < pop4()) {    /* still going up */
                                tl = *tlp + 1;  /* inc index var */
                                tl1 = *pc.lp++; /* index lower bound */
                        if (*tlp < pop4()) {    /* still going up */
                                tl = *tlp + 1;  /* inc index var */
                                tl1 = *pc.lp++; /* index lower bound */
@@ -1198,7 +1210,7 @@ interpreter(base)
                        continue;
                case O_FOR1D:
                        pc.cp++;
                        continue;
                case O_FOR1D:
                        pc.cp++;
-                       tcp = (char *)pop4();   /* tcp = ptr to index var */
+                       tcp = popaddr();        /* tcp = ptr to index var */
                        if (*tcp > pop4()) {    /* still going down */
                                tl = *tcp - 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
                        if (*tcp > pop4()) {    /* still going down */
                                tl = *tcp - 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
@@ -1213,7 +1225,7 @@ interpreter(base)
                        continue;
                case O_FOR2D:
                        pc.cp++;
                        continue;
                case O_FOR2D:
                        pc.cp++;
-                       tsp = (short *)pop4();  /* tsp = ptr to index var */
+                       tsp = (short *)popaddr(); /* tsp = ptr to index var */
                        if (*tsp > pop4()) {    /* still going down */
                                tl = *tsp - 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
                        if (*tsp > pop4()) {    /* still going down */
                                tl = *tsp - 1;  /* inc index var */
                                tl1 = *pc.sp++; /* index lower bound */
@@ -1228,7 +1240,7 @@ interpreter(base)
                        continue;
                case O_FOR4D:
                        pc.cp++;
                        continue;
                case O_FOR4D:
                        pc.cp++;
-                       tlp = (long *)pop4();   /* tlp = ptr to index var */
+                       tlp = (long *)popaddr(); /* tlp = ptr to index var */
                        if (*tlp > pop4()) {    /* still going down */
                                tl = *tlp - 1;  /* inc index var */
                                tl1 = *pc.lp++; /* index lower bound */
                        if (*tlp > pop4()) {    /* still going down */
                                tl = *tlp - 1;  /* inc index var */
                                tl1 = *pc.lp++; /* index lower bound */
@@ -1243,7 +1255,7 @@ interpreter(base)
                        continue;
                case O_READE:
                        pc.cp++;
                        continue;
                case O_READE:
                        pc.cp++;
-                       push2(READE(curfile, base + *pc.lp++));
+                       push2((short)(READE(curfile, base + *pc.lp++)));
                        continue;
                case O_READ4:
                        pc.cp++;
                        continue;
                case O_READ4:
                        pc.cp++;
@@ -1251,7 +1263,7 @@ interpreter(base)
                        continue;
                case O_READC:
                        pc.cp++;
                        continue;
                case O_READC:
                        pc.cp++;
-                       push2(READC(curfile));
+                       push2((short)(READC(curfile)));
                        continue;
                case O_READ8:
                        pc.cp++;
                        continue;
                case O_READ8:
                        pc.cp++;
@@ -1263,40 +1275,38 @@ interpreter(base)
                        continue;
                case O_EOF:
                        pc.cp++;
                        continue;
                case O_EOF:
                        pc.cp++;
-                       push2(TEOF(popaddr()));
+                       push2((short)(TEOF(popaddr())));
                        continue;
                case O_EOLN:
                        pc.cp++;
                        continue;
                case O_EOLN:
                        pc.cp++;
-                       push2(TEOLN(popaddr()));
+                       push2((short)(TEOLN(popaddr())));
                        continue;
                case O_WRITEC:
                        continue;
                case O_WRITEC:
-                       pc.cp++;
                        if (_runtst) {
                                WRITEC(curfile);
                        if (_runtst) {
                                WRITEC(curfile);
-                               popargs(2);
+                               popsp((long)(*pc.cp++));
                                continue;
                        }
                        fputc();
                                continue;
                        }
                        fputc();
-                       popargs(2);
+                       popsp((long)(*pc.cp++));
                        continue;
                case O_WRITES:
                        continue;
                case O_WRITES:
-                       pc.cp++;
                        if (_runtst) {
                                WRITES(curfile);
                        if (_runtst) {
                                WRITES(curfile);
-                               popargs(4);
+                               popsp((long)(*pc.cp++));
                                continue;
                        }
                        fwrite();
                                continue;
                        }
                        fwrite();
-                       popargs(4);
+                       popsp((long)(*pc.cp++));
                        continue;
                case O_WRITEF:
                        if (_runtst) {
                                WRITEF(curfile);
                        continue;
                case O_WRITEF:
                        if (_runtst) {
                                WRITEF(curfile);
-                               popargs(*pc.cp++);
+                               popsp((long)(*pc.cp++));
                                continue;
                        }
                        fprintf();
                                continue;
                        }
                        fprintf();
-                       popargs(*pc.cp++);
+                       popsp((long)(*pc.cp++));
                        continue;
                case O_WRITLN:
                        pc.cp++;
                        continue;
                case O_WRITLN:
                        pc.cp++;
@@ -1312,7 +1322,7 @@ interpreter(base)
                                PAGE(curfile);
                                continue;
                        }
                                PAGE(curfile);
                                continue;
                        }
-                       fputc('^L', ACTFILE(curfile));
+                       fputc('\f', ACTFILE(curfile));
                        continue;
                case O_NAM:
                        pc.cp++;
                        continue;
                case O_NAM:
                        pc.cp++;
@@ -1325,7 +1335,7 @@ interpreter(base)
                                tl = *pc.usp++;
                        tl1 = pop4();
                        if (_runtst) {
                                tl = *pc.usp++;
                        tl1 = pop4();
                        if (_runtst) {
-                               push4(MAX(tl1, tl, *pc.usp++));
+                               push4(MAX(tl1, tl, (long)(*pc.usp++)));
                                continue;
                        }
                        tl1 -= tl;
                                continue;
                        }
                        tl1 -= tl;
@@ -1371,17 +1381,17 @@ interpreter(base)
                case O_DEFNAME:
                        pc.cp++;
                        DEFNAME();
                case O_DEFNAME:
                        pc.cp++;
                        DEFNAME();
-                       popargs(4);
+                       popsp((long)(2*sizeof(char *)+2*sizeof(long)));
                        continue;
                case O_RESET:
                        pc.cp++;
                        RESET();
                        continue;
                case O_RESET:
                        pc.cp++;
                        RESET();
-                       popargs(4);
+                       popsp((long)(2*sizeof(char *)+2*sizeof(long)));
                        continue;
                case O_REWRITE:
                        pc.cp++;
                        REWRITE();
                        continue;
                case O_REWRITE:
                        pc.cp++;
                        REWRITE();
-                       popargs(4);
+                       popsp((long)(2*sizeof(char *)+2*sizeof(long)));
                        continue;
                case O_FILE:
                        pc.cp++;
                        continue;
                case O_FILE:
                        pc.cp++;
@@ -1390,26 +1400,26 @@ interpreter(base)
                case O_REMOVE:
                        pc.cp++;
                        REMOVE();
                case O_REMOVE:
                        pc.cp++;
                        REMOVE();
-                       popargs(2);
+                       popsp((long)(sizeof(char *)+sizeof(long)));
                        continue;
                case O_FLUSH:
                        pc.cp++;
                        FLUSH();
                        continue;
                case O_FLUSH:
                        pc.cp++;
                        FLUSH();
-                       popargs(1);
+                       popsp((long)(sizeof(char *)));
                        continue;
                case O_PACK:
                        pc.cp++;
                        PACK();
                        continue;
                case O_PACK:
                        pc.cp++;
                        PACK();
-                       popargs(7);
+                       popsp((long)(5*sizeof(long)+2*sizeof(char*)));
                        continue;
                case O_UNPACK:
                        pc.cp++;
                        UNPACK();
                        continue;
                case O_UNPACK:
                        pc.cp++;
                        UNPACK();
-                       popargs(7);
+                       popsp((long)(5*sizeof(long)+2*sizeof(char*)));
                        continue;
                case O_ARGC:
                        pc.cp++;
                        continue;
                case O_ARGC:
                        pc.cp++;
-                       push4(_argc);
+                       push4((long)_argc);
                        continue;
                case O_ARGV:
                        tl = *pc.cp++;          /* tl = size of char array */
                        continue;
                case O_ARGV:
                        tl = *pc.cp++;          /* tl = size of char array */
@@ -1461,7 +1471,7 @@ interpreter(base)
                case O_UNDEF:
                        pc.cp++;
                        pop8();
                case O_UNDEF:
                        pc.cp++;
                        pop8();
-                       push2(0);
+                       push2((short)(0));
                        continue;
                case O_ATAN:
                        pc.cp++;
                        continue;
                case O_ATAN:
                        pc.cp++;
@@ -1499,15 +1509,15 @@ interpreter(base)
                case O_CHR4:
                        pc.cp++;
                        if (_runtst) {
                case O_CHR4:
                        pc.cp++;
                        if (_runtst) {
-                               push2(CHR(pop4()));
+                               push2((short)(CHR(pop4())));
                                continue;
                        }
                                continue;
                        }
-                       push2(pop4());
+                       push2((short)(pop4()));
                        continue;
                case O_ODD2:
                case O_ODD4:
                        pc.cp++;
                        continue;
                case O_ODD2:
                case O_ODD4:
                        pc.cp++;
-                       push2(pop4() & 1);
+                       push2((short)(pop4() & 1));
                        continue;
                case O_SUCC2:
                        tl = *pc.cp++;
                        continue;
                case O_SUCC2:
                        tl = *pc.cp++;
@@ -1515,10 +1525,10 @@ interpreter(base)
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
-                               push2(SUCC(tl1, tl, *pc.sp++));
+                               push2((short)(SUCC(tl1, tl, (long)(*pc.sp++))));
                                continue;
                        }
                                continue;
                        }
-                       push2(tl1 + 1);
+                       push2((short)(tl1 + 1));
                        pc.sp++;
                        continue;
                case O_SUCC24:
                        pc.sp++;
                        continue;
                case O_SUCC24:
@@ -1527,7 +1537,7 @@ interpreter(base)
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
-                               push4(SUCC(tl1, tl, *pc.sp++));
+                               push4(SUCC(tl1, tl, (long)(*pc.sp++)));
                                continue;
                        }
                        push4(tl1 + 1);
                                continue;
                        }
                        push4(tl1 + 1);
@@ -1539,7 +1549,7 @@ interpreter(base)
                                tl = *pc.lp++;
                        tl1 = pop4();
                        if (_runtst) {
                                tl = *pc.lp++;
                        tl1 = pop4();
                        if (_runtst) {
-                               push4(SUCC(tl1, tl, *pc.lp++));
+                               push4(SUCC(tl1, tl, (long)(*pc.lp++)));
                                continue;
                        }
                        push4(tl1 + 1);
                                continue;
                        }
                        push4(tl1 + 1);
@@ -1551,10 +1561,10 @@ interpreter(base)
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
-                               push2(PRED(tl1, tl, *pc.sp++));
+                               push2((short)(PRED(tl1, tl, (long)(*pc.sp++))));
                                continue;
                        }
                                continue;
                        }
-                       push2(tl1 - 1);
+                       push2((short)(tl1 - 1));
                        pc.sp++;
                        continue;
                case O_PRED24:
                        pc.sp++;
                        continue;
                case O_PRED24:
@@ -1563,7 +1573,7 @@ interpreter(base)
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
                                tl = *pc.sp++;
                        tl1 = pop4();
                        if (_runtst) {
-                               push4(PRED(tl1, tl, *pc.sp++));
+                               push4(PRED(tl1, tl, (long)(*pc.sp++)));
                                continue;
                        }
                        push4(tl1 - 1);
                                continue;
                        }
                        push4(tl1 - 1);
@@ -1575,7 +1585,7 @@ interpreter(base)
                                tl = *pc.lp++;
                        tl1 = pop4();
                        if (_runtst) {
                                tl = *pc.lp++;
                        tl1 = pop4();
                        if (_runtst) {
-                               push4(PRED(tl1, tl, *pc.lp++));
+                               push4(PRED(tl1, tl, (long)(*pc.lp++)));
                                continue;
                        }
                        push4(tl1 - 1);
                                continue;
                        }
                        push4(tl1 - 1);
@@ -1612,6 +1622,9 @@ interpreter(base)
                        pc.cp++;
                        push4(TRUNC(pop8()));
                        continue;
                        pc.cp++;
                        push4(TRUNC(pop8()));
                        continue;
+               default:
+                       panic(PBADOP);
+                       continue;
                }
        }
 }
                }
        }
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.