BSD 4_4 release

[unix-history] / usr / src / sys / sparc / sparc / trap.c

diff --git a/usr/src/sys/sparc/sparc/trap.c b/usr/src/sys/sparc/sparc/trap.c
index f8fb6d6..a58868d 100644 (file)
--- a/usr/src/sys/sparc/sparc/trap.c
+++ b/usr/src/sys/sparc/sparc/trap.c
@@ -1,6 +1,6 @@
 /*
 /*

- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and


@@ -11,9 +11,35 @@
  *     This product includes software developed by the University of
  *     California, Lawrence Berkeley Laboratory.
  *
  *     This product includes software developed by the University of
  *     California, Lawrence Berkeley Laboratory.
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- *     @(#)trap.c      7.5 (Berkeley) %G%
+ *     @(#)trap.c      8.1 (Berkeley) 6/16/93

  *
  * from: $Header: trap.c,v 1.34 93/05/28 04:34:50 torek Exp $
  */
  *
  * from: $Header: trap.c,v 1.34 93/05/28 04:34:50 torek Exp $
  */


@@ -676,8 +702,8 @@ syscall(code, tf, pc, suncompat)
         * Any arguments beyond that are in the `argument extension' area
         * of the user's stack frame (see <machine/frame.h>).
         *
         * Any arguments beyond that are in the `argument extension' area
         * of the user's stack frame (see <machine/frame.h>).
         *

-        * Check for ``special'' codes that alter this, namely indir and
-        * __indir.  The latter takes a quad syscall number, so that other
+        * Check for ``special'' codes that alter this, namely syscall and
+        * __syscall.  The latter takes a quad syscall number, so that other

         * arguments are at their natural alignments.  Adjust the number
         * of ``easy'' arguments as appropriate; we will copy the hard
         * ones later as needed.
         * arguments are at their natural alignments.  Adjust the number
         * of ``easy'' arguments as appropriate; we will copy the hard
         * ones later as needed.


@@ -686,12 +712,12 @@ syscall(code, tf, pc, suncompat)
        nap = 6;
        switch (code) {
 
        nap = 6;
        switch (code) {
 

-       case SYS_indir:
+       case SYS_syscall:

                code = *ap++;
                nap--;
                break;
 
                code = *ap++;
                nap--;
                break;
 

-       case SYS___indir:
+       case SYS___syscall:

 #ifdef COMPAT_SUNOS
                if (suncompat)
                        break;
 #ifdef COMPAT_SUNOS
                if (suncompat)
                        break;


@@ -702,7 +728,7 @@ syscall(code, tf, pc, suncompat)
                break;
 
        }
                break;
 
        }

-       /* Callp currently points to indir, which returns ENOSYS. */
+       /* Callp currently points to syscall, which returns ENOSYS. */

        if (code < nsys) {
                callp += code;
                i = callp->sy_narg;
        if (code < nsys) {
                callp += code;
                i = callp->sy_narg;