BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / pascal / px / int.c

diff --git a/usr/src/usr.bin/pascal/px/int.c b/usr/src/usr.bin/pascal/px/int.c
index 5058080..cc90d05 100644 (file)
--- a/usr/src/usr.bin/pascal/px/int.c
+++ b/usr/src/usr.bin/pascal/px/int.c
@@ -1,6 +1,45 @@
-/* Copyright (c) 1979 Regents of the University of California */
+/*-
+ * 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
+char copyright[] =
+"@(#) Copyright (c) 1980 The Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */

 
 

-static char sccsid[] = "@(#)int.c 1.6 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)int.c      5.3 (Berkeley) 4/16/91";
+#endif /* not lint */

 
 /*
  * px - interpreter for Berkeley Pascal
 
 /*
  * px - interpreter for Berkeley Pascal


@@ -15,6 +54,7 @@ static char sccsid[] = "@(#)int.c 1.6 %G%";
 #include       <signal.h>
 #include       "whoami.h"
 #include       "vars.h"
 #include       <signal.h>
 #include       "whoami.h"
 #include       "vars.h"

+#include       "libpc.h"

 #include       "objfmt.h"
 
 /*
 #include       "objfmt.h"
 
 /*


@@ -23,7 +63,8 @@ static char sccsid[] = "@(#)int.c 1.6 %G%";
 
 extern char *end;
 extern loopaddr();
 
 extern char *end;
 extern loopaddr();

-union progcntr *pcaddrp;       /* address of interpreter frame address */
+extern union progcntr pdx_pc;  /* address of interpreter program cntr */
+static void inittrap();

 
 main(ac,av)
 
 
 main(ac,av)
 


@@ -69,6 +110,14 @@ main(ac,av)
                name = file;
        }
 \f
                name = file;
        }
 \f

+       /*
+        * kludge to check for old style objs.
+        */
+       if (_mode == PX && !strcmp(file, "-")) {
+               fprintf(stderr, "%s is obsolete and must be recompiled\n",
+                   _argv[0]);
+               exit(1);
+       }

        /*
         * Process program header information
         */
        /*
         * Process program header information
         */


@@ -128,14 +177,14 @@ main(ac,av)
        if (signal(SIGINT,SIG_IGN) != SIG_IGN)
                signal(SIGINT,intr);
        signal(SIGSEGV,memsize);
        if (signal(SIGINT,SIG_IGN) != SIG_IGN)
                signal(SIGINT,intr);
        signal(SIGSEGV,memsize);

-       signal(SIGFPE,except);
+       signal(SIGFPE,EXCEPT);

        signal(SIGTRAP,liberr);
 
        /*
         * See if we're being watched by the debugger, if so set a trap.
         */
        if (_mode == PDX || (_mode == PIX && pxhd.symtabsize > 0)) {
        signal(SIGTRAP,liberr);
 
        /*
         * See if we're being watched by the debugger, if so set a trap.
         */
        if (_mode == PDX || (_mode == PIX && pxhd.symtabsize > 0)) {

-               inittrap(&_display, &_dp, objprog, &pcaddrp, loopaddr);
+               inittrap(&_display, &_dp, objprog, &pdx_pc, loopaddr);

        }
 
        /*
        }
 
        /*


@@ -153,7 +202,6 @@ main(ac,av)
        signal(SIGBUS,SIG_DFL);
        signal(SIGSYS,SIG_DFL);
        PFLUSH();
        signal(SIGBUS,SIG_DFL);
        signal(SIGSYS,SIG_DFL);
        PFLUSH();

-       /* pfree(objprog); */

        psexit(0);
 }
 
        psexit(0);
 }
 


@@ -163,11 +211,12 @@ main(ac,av)
  * not the procedure.
  */
 
  * not the procedure.
  */
 

-static inittrap(dispaddr, dpaddr, endaddr, pcaddrp, loopaddrp)
+static void
+inittrap(dispaddr, dpaddr, endaddr, pcaddr, loopaddrp)

 union disply *dispaddr;
 struct disp *dpaddr;
 char *endaddr;
 union disply *dispaddr;
 struct disp *dpaddr;
 char *endaddr;

-union progcntr **pcaddrp;
+union progcntr *pcaddr;

 char **loopaddrp;
 {
        kill(getpid(), SIGIOT);
 char **loopaddrp;
 {
        kill(getpid(), SIGIOT);