BSD 4_4 release

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

diff --git a/usr/src/sys/tahoe/tahoe/trap.c b/usr/src/sys/tahoe/tahoe/trap.c
index bb6abd8..4c81cc7 100644 (file)
--- a/usr/src/sys/tahoe/tahoe/trap.c
+++ b/usr/src/sys/tahoe/tahoe/trap.c
@@ -3,26 +3,26 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)trap.c      7.9 (Berkeley) %G%
+ *     @(#)trap.c      7.11 (Berkeley) 12/16/90

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "user.h"
-#include "proc.h"
-#include "seg.h"
-#include "acct.h"
-#include "kernel.h"
+#include "sys/param.h"
+#include "sys/systm.h"
+#include "sys/user.h"
+#include "sys/proc.h"
+#include "sys/seg.h"
+#include "sys/acct.h"
+#include "sys/kernel.h"

 
 

-#include "psl.h"
-#include "reg.h"
-#include "pte.h"
-#include "mtpr.h"
+#include "../include/psl.h"
+#include "../include/reg.h"
+#include "../include/pte.h"
+#include "../include/mtpr.h"

 #ifdef KTRACE
 #ifdef KTRACE

-#include "ktrace.h"
+#include "sys/ktrace.h"

 #endif
 
 #endif
 

-#include "../tahoe/trap.h"
+#include "../include/trap.h"

 
 #define        USER    040             /* user-mode flag added to type */
 
 
 #define        USER    040             /* user-mode flag added to type */
 


@@ -217,7 +217,10 @@ syscall(sp, type, hfs, accmst, acclst, dbl, code, pc, psl)
        register struct proc *p = u.u_procp;
        struct timeval syst;
        int error, opc;
        register struct proc *p = u.u_procp;
        struct timeval syst;
        int error, opc;

-       int args[8], rval[2];
+       struct args {
+               int i[8];
+       } args;
+       int rval[2];

 
 #ifdef lint
        r0 = 0; r0 = r0; r1 = 0; r1 = r1;
 
 #ifdef lint
        r0 = 0; r0 = r0; r1 = 0; r1 = r1;


@@ -251,22 +254,22 @@ syscall(sp, type, hfs, accmst, acclst, dbl, code, pc, psl)
        else
                callp = &sysent[code];
        if ((i = callp->sy_narg * sizeof (int)) &&
        else
                callp = &sysent[code];
        if ((i = callp->sy_narg * sizeof (int)) &&

-           (error = copyin(params, (caddr_t)args, (u_int)i)) != 0) {
+           (error = copyin(params, (caddr_t)&args, (u_int)i)) != 0) {

                locr0[R0] = error;
                locr0[PS] |= PSL_C;     /* carry bit */
 #ifdef KTRACE
                if (KTRPOINT(p, KTR_SYSCALL))
                locr0[R0] = error;
                locr0[PS] |= PSL_C;     /* carry bit */
 #ifdef KTRACE
                if (KTRPOINT(p, KTR_SYSCALL))

-                       ktrsyscall(p->p_tracep, code, callp->sy_narg, args);
+                       ktrsyscall(p->p_tracep, code, callp->sy_narg, args.i);

 #endif
                goto done;
        }
 #ifdef KTRACE
        if (KTRPOINT(p, KTR_SYSCALL))
 #endif
                goto done;
        }
 #ifdef KTRACE
        if (KTRPOINT(p, KTR_SYSCALL))

-               ktrsyscall(p->p_tracep, code, callp->sy_narg, args);
+               ktrsyscall(p->p_tracep, code, callp->sy_narg, args.i);

 #endif
        rval[0] = 0;
        rval[1] = locr0[R1];
 #endif
        rval[0] = 0;
        rval[1] = locr0[R1];

-       error = (*callp->sy_call)(u.u_procp, args, rval);
+       error = (*callp->sy_call)(u.u_procp, &args, rval);

        if (error == ERESTART)
                pc = opc;
        else if (error != EJUSTRETURN) {
        if (error == ERESTART)
                pc = opc;
        else if (error != EJUSTRETURN) {