[src/trunk]: src/sys Make the beast build again (but it is still probably bro...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Make the beast build again (but it is still probably bro...
From: manu <manu%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 12:36:16 +0000
details:   https://anonhg.NetBSD.org/src/rev/8d6a2f0fb309
branches:  trunk
changeset: 542262:8d6a2f0fb309
user:      manu <manu%NetBSD.org@localhost>
date:      Fri Jan 24 21:37:01 2003 +0000

description:
Make the beast build again (but it is still probably broken)

diffstat:

 sys/arch/powerpc/powerpc/darwin_machdep.c |  29 ++++++++++++++++-------------
 sys/compat/darwin/darwin_mman.c           |   7 ++++---
 sys/compat/darwin/darwin_signal.c         |   5 +++--
 sys/compat/darwin/darwin_syscall.h        |   2 +-
 sys/compat/darwin/darwin_syscallargs.h    |   2 +-
 sys/compat/darwin/darwin_syscalls.c       |   5 +++--
 sys/compat/darwin/darwin_sysctl.c         |   5 +++--
 sys/compat/darwin/darwin_sysent.c         |   5 +++--
 sys/compat/darwin/darwin_thread.c         |   5 +++--
 sys/compat/mach/mach_message.c            |   8 ++++----
 sys/compat/mach/mach_port.c               |  31 ++++++++++++++++---------------
 sys/compat/mach/mach_task.c               |  12 ++++++------
 sys/compat/mach/mach_thread.c             |   8 ++++----
 13 files changed, 67 insertions(+), 57 deletions(-)

diffs (truncated from 537 to 300 lines):

diff -r cde166757bba -r 8d6a2f0fb309 sys/arch/powerpc/powerpc/darwin_machdep.c
--- a/sys/arch/powerpc/powerpc/darwin_machdep.c Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/arch/powerpc/powerpc/darwin_machdep.c Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_machdep.c,v 1.5 2002/12/08 21:53:11 manu Exp $ */
+/*     $NetBSD: darwin_machdep.c,v 1.6 2003/01/24 21:37:01 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_machdep.c,v 1.5 2002/12/08 21:53:11 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_machdep.c,v 1.6 2003/01/24 21:37:01 manu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,7 +69,8 @@
        sigset_t *mask;
        u_long code;
 {
-       struct proc *p = curproc;
+       struct lwp *l = curlwp;
+       struct proc *p = l->l_proc;
        struct sigacts *ps = p->p_sigacts;
        struct trapframe *tf;
        struct darwin_sigframe *sfp, sf;
@@ -78,7 +79,7 @@
        sig_t catcher = SIGACTION(p, sig).sa_handler;
        int error;
 
-       tf = trapframe(p);
+       tf = trapframe(l);
 
        /* Use an alternate signal stack? */
        onstack =
@@ -138,19 +139,19 @@
 
        /* Copyout mcontext */
        if ((error = copyout(&sf.dmc, &sfp->dmc, sizeof(sf.dmc))) != 0) {
-               sigexit(p, SIGILL);
+               sigexit(l, SIGILL);
                /* NOTREACHED */
        }
 
        /* Copyout ucontext */
        if ((error = copyout(&sf.duc, &sfp->duc, sizeof(sf.duc))) != 0) {
-               sigexit(p, SIGILL);
+               sigexit(l, SIGILL);
                /* NOTREACHED */
        }
 
        /* Darwin only supports libc based trampoline */
        if (ps->sa_sigdesc[sig].sd_vers != 1) {
-               sigexit(p, SIGILL);
+               sigexit(l, SIGILL);
                /* NOTREACHED */
        }
 
@@ -178,14 +179,15 @@
  * before the signal delivery.
  */
 int
-darwin_sys_sigreturn(p, v, retval)
-       struct proc *p;
+darwin_sys_sigreturn(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct darwin_sys_sigreturn_args /* {
                syscallarg(struct darwin_ucontext *) uctx;
        } */ *uap = v;
+       struct proc *p = l->l_proc;
        struct darwin_ucontext uctx;
        struct darwin_mcontext mctx;
        struct trapframe *tf;
@@ -210,11 +212,11 @@
                return (error);
 
        /* Check for security abuse */
-       tf = trapframe(p);
+       tf = trapframe(l);
        mctx.ss.srr1 &= ~(PSL_POW | PSL_ILE | PSL_IP | PSL_LE | PSL_RI);
        mctx.ss.srr1 |= (PSL_PR | PSL_ME | PSL_IR | PSL_DR | PSL_EE); 
        if ((mctx.ss.srr1 & PSL_USERSTATIC) != (tf->srr1 & PSL_USERSTATIC)) {
-               DPRINTF(("uctx.ss.srr1 = 0x%08x, rf->srr1 = 0x%08x\n",
+               DPRINTF(("uctx.ss.srr1 = 0x%08x, rf->srr1 = 0x%08lx\n",
                    mctx.ss.srr1, tf->srr1));
                return (EINVAL);
        }
@@ -259,8 +261,9 @@
 darwin_fork_child_return(arg)
        void *arg;
 {
-       struct proc * const p = arg;
-       struct trapframe * const tf = trapframe(p);
+       struct lwp * const l = arg;
+       struct proc * const p = l->l_proc;
+       struct trapframe * const tf = trapframe(l);
 
        child_return(arg);
 
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_mman.c
--- a/sys/compat/darwin/darwin_mman.c   Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_mman.c   Fri Jan 24 21:37:01 2003 +0000
@@ -1,6 +1,6 @@
 #undef DEBUG_DARWIN
 #undef DEBUG_MACH
-/*     $NetBSD: darwin_mman.c,v 1.6 2003/01/22 17:47:03 christos Exp $ */
+/*     $NetBSD: darwin_mman.c,v 1.7 2003/01/24 21:37:02 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_mman.c,v 1.6 2003/01/22 17:47:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_mman.c,v 1.7 2003/01/24 21:37:02 manu Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -53,6 +53,7 @@
 #include <sys/filedesc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
+#include <sys/sa.h>
 
 #include <sys/syscallargs.h>
 
@@ -121,7 +122,7 @@
        SCARG(&open_cup, path) = SCARG(uap, filename);
        SCARG(&open_cup, flags) = O_RDONLY;
        SCARG(&open_cup, mode) = 0;
-       if ((error = bsd_sys_open(l, &open_cup, &fd)) != 0)
+       if ((error = bsd_sys_open(l, &open_cup, (register_t *)&fd)) != 0)
                return error;
        
        fdp = p->p_fd;
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_signal.c
--- a/sys/compat/darwin/darwin_signal.c Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_signal.c Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_signal.c,v 1.5 2003/01/22 17:47:03 christos Exp $ */
+/*     $NetBSD: darwin_signal.c,v 1.6 2003/01/24 21:37:02 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.5 2003/01/22 17:47:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.6 2003/01/24 21:37:02 manu Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -45,6 +45,7 @@
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/signal.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <compat/common/compat_util.h>
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_syscall.h
--- a/sys/compat/darwin/darwin_syscall.h        Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_syscall.h        Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_syscall.h,v 1.20 2003/01/22 17:47:47 christos Exp $ */
+/* $NetBSD: darwin_syscall.h,v 1.21 2003/01/24 21:37:02 manu Exp $ */
 
 /*
  * System call numbers.
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_syscallargs.h
--- a/sys/compat/darwin/darwin_syscallargs.h    Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_syscallargs.h    Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_syscallargs.h,v 1.20 2003/01/22 17:47:48 christos Exp $ */
+/* $NetBSD: darwin_syscallargs.h,v 1.21 2003/01/24 21:37:02 manu Exp $ */
 
 /*
  * System call argument lists.
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_syscalls.c
--- a/sys/compat/darwin/darwin_syscalls.c       Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_syscalls.c       Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_syscalls.c,v 1.20 2003/01/22 17:47:48 christos Exp $ */
+/* $NetBSD: darwin_syscalls.c,v 1.21 2003/01/24 21:37:02 manu Exp $ */
 
 /*
  * System call names.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_syscalls.c,v 1.20 2003/01/22 17:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_syscalls.c,v 1.21 2003/01/24 21:37:02 manu Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -23,6 +23,7 @@
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 #include <compat/common/compat_file.h>
 #include <compat/mach/mach_types.h>
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_sysctl.c
--- a/sys/compat/darwin/darwin_sysctl.c Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_sysctl.c Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_sysctl.c,v 1.9 2003/01/22 17:47:03 christos Exp $ */
+/*     $NetBSD: darwin_sysctl.c,v 1.10 2003/01/24 21:37:02 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.9 2003/01/22 17:47:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.10 2003/01/24 21:37:02 manu Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,6 +46,7 @@
 #include <sys/mount.h> 
 #include <sys/proc.h> 
 #include <sys/sysctl.h> 
+#include <sys/sa.h> 
 
 #include <sys/syscallargs.h>
 
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_sysent.c
--- a/sys/compat/darwin/darwin_sysent.c Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_sysent.c Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_sysent.c,v 1.21 2003/01/22 17:47:48 christos Exp $ */
+/* $NetBSD: darwin_sysent.c,v 1.22 2003/01/24 21:37:02 manu Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_sysent.c,v 1.21 2003/01/22 17:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_sysent.c,v 1.22 2003/01/24 21:37:02 manu Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
@@ -22,6 +22,7 @@
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 #include <compat/common/compat_file.h>
 #include <compat/mach/mach_types.h>
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/darwin/darwin_thread.c
--- a/sys/compat/darwin/darwin_thread.c Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/darwin/darwin_thread.c Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_thread.c,v 1.4 2003/01/22 17:47:03 christos Exp $ */
+/*     $NetBSD: darwin_thread.c,v 1.5 2003/01/24 21:37:02 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_thread.c,v 1.4 2003/01/22 17:47:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_thread.c,v 1.5 2003/01/24 21:37:02 manu Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -45,6 +45,7 @@
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
+#include <sys/sa.h>
 
 #include <sys/syscallargs.h>
 
diff -r cde166757bba -r 8d6a2f0fb309 sys/compat/mach/mach_message.c
--- a/sys/compat/mach/mach_message.c    Fri Jan 24 21:26:08 2003 +0000
+++ b/sys/compat/mach/mach_message.c    Fri Jan 24 21:37:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_message.c,v 1.21 2003/01/21 04:06:07 matt Exp $ */
+/*     $NetBSD: mach_message.c,v 1.22 2003/01/24 21:37:03 manu Exp $ */
 
 /*-
  * Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
Prev by Date: [src/trunk]: src/sys/dev/ic zs_shutdown: lower IPL before sleeping. Also not...
Next by Date: [src/trunk]: src/sys/compat/mach/arch/powerpc/fasttraps Use per process emuld...
Previous by Thread: [src/trunk]: src/sys/dev/ic zs_shutdown: lower IPL before sleeping. Also not...
Next by Thread: [src/trunk]: src/sys/compat/mach/arch/powerpc/fasttraps Use per process emuld...
Indexes:
Home | Main Index | Thread Index | Old Index