4.4BSD snapshot (revision 8.1); add 1993 to copyright

[unix-history] / usr / src / usr.bin / pascal / pdx / process / resume.c

diff --git a/usr/src/usr.bin/pascal/pdx/process/resume.c b/usr/src/usr.bin/pascal/pdx/process/resume.c
index 16bd6de..8ef5fb3 100644 (file)
--- a/usr/src/usr.bin/pascal/pdx/process/resume.c
+++ b/usr/src/usr.bin/pascal/pdx/process/resume.c
@@ -1,9 +1,16 @@
-/* Copyright (c) 1982 Regents of the University of California */
+/*-
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */

 
 

-static char sccsid[] = "@(#)resume.c 1.3 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)resume.c   8.1 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
 
 /*

- * resume execution, first setting appropriate registers
+ * Resume execution, first setting appropriate registers.

  */
 
 #include "defs.h"
  */
 
 #include "defs.h"


@@ -14,152 +21,80 @@ static char sccsid[] = "@(#)resume.c 1.3 %G%";
 #include "process.rep"
 #include "runtime/frame.rep"
 
 #include "process.rep"
 #include "runtime/frame.rep"
 

-#      if (isvaxpx)
-#              include "machine/pxerrors.h"
-#              include "pxinfo.h"
-#      endif
-
-LOCAL ADDRESS fetchpc();
+#include "machine/pxerrors.h"
+#include "pxinfo.h"

 
 /*
 
 /*

- * If we hit a breakpoint, px's pc points at a halt instruction,
- * this must be avoided when restarting.
+ * Resume execution, set (get) pcode location counter before (after) resuming.

  */
 
 resume()
 {
  */
 
 resume()
 {

-       register PROCESS *p;
-       int oldsigno;
-
-       p = process;
-       do {
-               if (option('e')) {
-                       printf("execution resumes at pc 0x%x, lc %d\n", process->pc, pc);
-                       fflush(stdout);
-               }
-               pcont(p);
-#              if (isvaxpx)
-                       if (p->status == STOPPED) {
-                               if (isbperr()) {
-                                       pc = p->reg[11];
-                               } else {
-                                       dread(&pcframe, PCADDRP, sizeof(pcframe));
-                                       pcframe++;
-                                       pc = fetchpc(pcframe);
-                               }
-                               pc -= (sizeof(char) + ENDOFF);
-                       }
-#              else
-                       pc = process->pc;
-#              endif
-               if (option('e')) {
-                       printf("execution stops at pc 0x%x, lc %d on sig %d\n",
-                               process->pc, pc, p->signo);
-                       fflush(stdout);
-               }
-               if (p->status == STOPPED) {
-                       errnum = 0;
-               }
-       } while (p->signo == SIGCONT);
-#      if (isvaxpx)
-               oldsigno = p->signo;
-               switch (p->signo) {
-                       case SIGFPE:
-                               errnum = EOVERFLOW;
-                               p->signo = ESIGNAL;
-                               break;
-
-                       case SIGSEGV:
-                               errnum = ESTKOVER;
-                               p->signo = ESIGNAL;
-                               break;
-               }
-               if (option('r') && oldsigno != 0) {
-                       p->signo = oldsigno;
-                       choose();
-                       p->signo = ESIGNAL;
-               }
-               if (isbperr()) {
-                       p->pc++;
-               }
-#      endif
-}
-
-# if (isvaxpx)
-
-/*
- * Find the location in the Pascal object where execution was suspended.
- */
+    register PROCESS *p;

 
 

-typedef struct {
-       int fr_handler;
-       unsigned int fr_psw : 16;       /* saved psw */
-       unsigned int fr_mask : 12;      /* register save mask */
-       unsigned int fr_unused : 1;
-       unsigned int fr_s : 1;          /* call was a calls, not callg */
-       unsigned int fr_spa : 2;        /* stack pointer alignment */
-       unsigned int fr_savap;          /* saved arg pointer */
-       unsigned int fr_savfp;          /* saved frame pointer */
-       int fr_savpc;                   /* saved program counter */
-} Vaxframe;
-
-LOCAL ADDRESS fetchpc(framep)
-ADDRESS *framep;
-{
-       register PROCESS *p;
-       Vaxframe vframe;
-       ADDRESS *savfp;
-       ADDRESS r;
-
-       p = process;
-       if (p->fp == (ADDRESS) framep) {
-               return(p->reg[11]);
-       }
-       savfp = (ADDRESS *) p->fp;
-       dread(&vframe, savfp, sizeof(vframe));
-       while (vframe.fr_savfp != (int) framep && vframe.fr_savfp != 0) {
-               savfp = (ADDRESS *) vframe.fr_savfp;
-               dread(&vframe, savfp, sizeof(vframe));
+    p = process;
+    do {
+       if (option('e')) {
+           printf("execution resumes at pc 0x%x, lc %d\n", process->pc, pc);
+           fflush(stdout);

        }
        }

-       if (vframe.fr_savfp == 0) {
-               panic("resume: can't find interpreter frame 0x%x", framep);
+       pcont(p);
+       dread(&pc, PCADDR, sizeof(pc));         /* Get pcode pc */
+       if (option('e')) {
+           printf("execution stops at pc 0x%x, lc %d on sig %d\n",
+               process->pc, pc, p->signo);
+           fflush(stdout);

        }
        }

-       if (vframe.fr_mask == 0) {
-               r = p->reg[11];
-       } else {
-               dread(&r, savfp + 5, sizeof(r));
-               r -= sizeof(char);
+    } while (p->signo == SIGCONT);
+    if (option('r') && p->signo != 0) {
+       choose();
+    }
+
+    /*
+     * If px implements a breakpoint by executing a halt instruction
+     * the real pc must be incremented to skip over it.
+     *
+     * Currently, px sends itself a signal so no incrementing is needed.
+     *
+       if (isbperr()) {
+           p->pc++;

        }
        }

-       return(r);
+     */

 }
 
 /*
  * Under the -r option, we offer the opportunity to just get
  * the px traceback and not actually enter the debugger.
 }
 
 /*
  * Under the -r option, we offer the opportunity to just get
  * the px traceback and not actually enter the debugger.

+ *
+ * If the standard input is not a tty but standard error is,
+ * change standard input to be /dev/tty.

  */
 
 LOCAL choose()
 {
  */
 
 LOCAL choose()
 {

-       register int c;
-
-       fprintf(stderr, "\nProgram error");
-       if (errnum != 0) {
-               fprintf(stderr, " -- %s", pxerrmsg[errnum]);
+    register int c;
+
+    if (!isterm(stdin)) {
+       if (!isterm(stderr) || freopen("/dev/tty", "r", stdin) == NIL) {
+           unsetsigtraces(process);
+           pcont(process);
+           quit(process->exitval);
+           /* NOTREACHED */

        }
        }

-       fprintf(stderr, "\nDo you wish to enter the debugger? ");
+    }
+    fprintf(stderr, "\nProgram error");
+    fprintf(stderr, "\nDo you wish to enter the debugger? ");
+    c = getchar();
+    if (c == 'n') {
+       unsetsigtraces(process);
+       pcont(process);
+       quit(process->exitval);
+    }
+    while (c != '\n' && c != EOF) {

        c = getchar();
        c = getchar();

-       if (c == 'n') {
-               unsetsigtraces(process);
-               pcont(process);
-               quit(process->exitval);
-       }
-       while (c != '\n') {
-               c = getchar();
-       }
-       fprintf(stderr, "\nEntering debugger ...");
-       init();
-       option('r') = FALSE;
-       fprintf(stderr, " type 'help' for help.\n");
+    }
+    fprintf(stderr, "\nEntering debugger ...");
+    init();
+    option('r') = FALSE;
+    fprintf(stderr, " type 'help' for help.\n");

 }
 }

-
-# endif