BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/pascal/pdx/process/start.c b/usr/src/usr.bin/pascal/pdx/process/start.c
index 39d3f1d..6efc620 100644 (file)
--- a/usr/src/usr.bin/pascal/pdx/process/start.c
+++ b/usr/src/usr.bin/pascal/pdx/process/start.c
@@ -1,12 +1,40 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1980 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)start.c    5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)start.c    5.4 (Berkeley) 4/16/91";
+#endif /* not lint */
+

 /*
  * Begin execution.
  *
 /*
  * Begin execution.
  *


@@ -31,9 +59,7 @@ static char sccsid[] = "@(#)start.c   5.1 (Berkeley) %G%";
 #include "sym.h"
 #include "process.rep"
 
 #include "sym.h"
 #include "process.rep"
 

-#   if (isvaxpx)
-#       include "pxinfo.h"
-#   endif
+#include "pxinfo.h"

 
 start(argv, infile, outfile)
 char **argv;
 
 start(argv, infile, outfile)
 char **argv;


@@ -42,41 +68,50 @@ char *infile, *outfile;
     char *cmd;
 
     setsigtrace();
     char *cmd;
 
     setsigtrace();

-#   if (isvaxpx)
-       cmd = "px";
-#   else
-       cmd = argv[0];
-#   endif
+    cmd = "px";

     pstart(process, cmd, argv, infile, outfile);
     if (process->status == STOPPED) {
     pstart(process, cmd, argv, infile, outfile);
     if (process->status == STOPPED) {

-#       if (isvaxpx)
-           TRAPARGS *ap, t;
+       TRAPARGS *ap, t;

 
 

-           pcont(process);
-           if (process->status != STOPPED) {
-               if (option('t')) {
-                   quit(process->exitval);
-               } else {
-                   panic("px exited with %d", process->exitval);
-               }
+       pcont(process);
+       if (process->status != STOPPED) {
+           if (option('t')) {
+               quit(process->exitval);
+           } else {
+               panic("px exited with %d", process->exitval);

            }
            }

-           dread(&ap, process->fp + 2*sizeof(int), sizeof(ap));
-           dread(&t, ap, sizeof(TRAPARGS));
-           if (t.nargs != 5) {
-               if (option('t')) {
-                   unsetsigtraces(process);
-                   pcont(process);
-                   quit(process->exitval);
-               } else {
-                   panic("start: args out of sync");
-               }
+       }
+#ifdef tahoe
+       dread(&ap, process->fp, sizeof(ap));
+       ap = (TRAPARGS *)((unsigned)ap - 4);
+       dread(&RETLOC, process->fp - 8, sizeof(RETLOC));
+#else
+       dread(&ap, process->fp + 2*sizeof(int), sizeof(ap));
+#endif
+       dread(&t, ap, sizeof(TRAPARGS));
+
+#define NARGS 5
+#ifdef tahoe
+#      define STKNARGS (sizeof(int)*(NARGS+1))
+#      define NARGLOC  t.trp_removed
+#else
+#      define STKNARGS (NARGS)
+#      define NARGLOC  t.nargs
+#endif
+       if (NARGLOC != STKNARGS) {
+           if (option('t')) {
+               unsetsigtraces(process);
+               pcont(process);
+               quit(process->exitval);
+           } else {
+               panic("start: args out of sync");

            }
            }

-           DISPLAY = t.disp;
-           DP = t.dp;
-           ENDOFF = t.objstart;
-           PCADDRP = t.pcaddrp;
-           LOOPADDR = t.loopaddr;
-#       endif
+       }
+       DISPLAY = t.disp;
+       DP = t.dp;
+       ENDOFF = t.objstart;
+       PCADDR = t.pcaddr;
+       LOOPADDR = t.loopaddr;

        pc = 0;
        curfunc = program;
        if (objsize != 0) {
        pc = 0;
        curfunc = program;
        if (objsize != 0) {


@@ -112,7 +147,6 @@ endprogram()
 
 LOCAL setsigtrace()
 {
 
 LOCAL setsigtrace()
 {

-    register int i;

     register PROCESS *p;
 
     p = process;
     register PROCESS *p;
 
     p = process;