Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/netbsd32 Merge the nathanw_sa branch.
details: https://anonhg.NetBSD.org/src/rev/dd61d8247ad8
branches: trunk
changeset: 541756:dd61d8247ad8
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Jan 18 08:28:25 2003 +0000
description:
Merge the nathanw_sa branch.
diffstat:
sys/compat/netbsd32/netbsd32.h | 7 +-
sys/compat/netbsd32/netbsd32_compat_09.c | 21 +-
sys/compat/netbsd32/netbsd32_compat_10.c | 42 +-
sys/compat/netbsd32/netbsd32_compat_12.c | 49 +-
sys/compat/netbsd32/netbsd32_compat_13.c | 23 +-
sys/compat/netbsd32/netbsd32_compat_14.c | 23 +-
sys/compat/netbsd32/netbsd32_compat_43.c | 190 ++++---
sys/compat/netbsd32/netbsd32_core.c | 10 +-
sys/compat/netbsd32/netbsd32_execve.c | 27 +-
sys/compat/netbsd32/netbsd32_fs.c | 81 ++-
sys/compat/netbsd32/netbsd32_ioctl.c | 10 +-
sys/compat/netbsd32/netbsd32_ipc.c | 71 +-
sys/compat/netbsd32/netbsd32_netbsd.c | 698 +++++++++++++++---------------
sys/compat/netbsd32/netbsd32_select.c | 17 +-
sys/compat/netbsd32/netbsd32_signal.c | 27 +-
sys/compat/netbsd32/netbsd32_socket.c | 29 +-
sys/compat/netbsd32/netbsd32_sysctl.c | 10 +-
sys/compat/netbsd32/netbsd32_time.c | 165 ++++--
sys/compat/netbsd32/netbsd32_wait.c | 14 +-
sys/compat/netbsd32/syscalls.master | 3 +-
20 files changed, 812 insertions(+), 705 deletions(-)
diffs (truncated from 4505 to 300 lines):
diff -r acd79e44fa61 -r dd61d8247ad8 sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h Sat Jan 18 08:19:32 2003 +0000
+++ b/sys/compat/netbsd32/netbsd32.h Sat Jan 18 08:28:25 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.23 2002/11/27 16:44:02 atatat Exp $ */
+/* $NetBSD: netbsd32.h,v 1.24 2003/01/18 08:28:25 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -41,6 +41,7 @@
#include <sys/systm.h>
#include <sys/mount.h>
#include <sys/stat.h>
+#include <sys/sa.h>
#include <sys/syscallargs.h>
#include <sys/ipc.h>
#include <sys/shm.h>
@@ -542,7 +543,7 @@
#define NETBSD32TOX_UAP(name, type) NETBSD32TOX(uap, &ua, name, type);
#define NETBSD32TOX64_UAP(name, type) NETBSD32TOX64(uap, &ua, name, type);
-int coredump_netbsd32(struct proc *, struct vnode *, struct ucred *);
+int coredump_netbsd32(struct lwp *, struct vnode *, struct ucred *);
/*
* random other stuff
@@ -550,6 +551,6 @@
#include <compat/common/compat_util.h>
void netbsd32_from_stat43 __P((struct stat43 *, struct netbsd32_stat43 *));
-int netbsd32_execve2(struct proc *, struct sys_execve_args *, register_t *);
+int netbsd32_execve2(struct lwp *, struct sys_execve_args *, register_t *);
#endif /* _COMPAT_NETBSD32_NETBSD32_H_ */
diff -r acd79e44fa61 -r dd61d8247ad8 sys/compat/netbsd32/netbsd32_compat_09.c
--- a/sys/compat/netbsd32/netbsd32_compat_09.c Sat Jan 18 08:19:32 2003 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_09.c Sat Jan 18 08:28:25 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.8 2002/10/23 13:16:40 scw Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.9 2003/01/18 08:28:25 thorpej Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -29,11 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.8 2002/10/23 13:16:40 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.9 2003/01/18 08:28:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
+#include <sys/sa.h>
#include <sys/syscallargs.h>
#include <sys/time.h>
@@ -44,8 +45,8 @@
#include <compat/netbsd32/netbsd32_syscallargs.h>
int
-compat_09_netbsd32_ogetdomainname(p, v, retval)
- struct proc *p;
+compat_09_netbsd32_ogetdomainname(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -53,6 +54,7 @@
syscallarg(netbsd32_charp) domainname;
syscallarg(int) len;
} */ *uap = v;
+ struct proc *p = l->l_proc;
int name;
size_t sz;
@@ -63,8 +65,8 @@
}
int
-compat_09_netbsd32_osetdomainname(p, v, retval)
- struct proc *p;
+compat_09_netbsd32_osetdomainname(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -72,6 +74,7 @@
syscallarg(netbsd32_charp) domainname;
syscallarg(int) len;
} */ *uap = v;
+ struct proc *p = l->l_proc;
int name;
int error;
@@ -83,8 +86,8 @@
}
int
-compat_09_netbsd32_uname(p, v, retval)
- struct proc *p;
+compat_09_netbsd32_uname(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -94,5 +97,5 @@
struct compat_09_sys_uname_args ua;
NETBSD32TOP_UAP(name, struct outsname);
- return (compat_09_sys_uname(p, &ua, retval));
+ return (compat_09_sys_uname(l, &ua, retval));
}
diff -r acd79e44fa61 -r dd61d8247ad8 sys/compat/netbsd32/netbsd32_compat_10.c
--- a/sys/compat/netbsd32/netbsd32_compat_10.c Sat Jan 18 08:19:32 2003 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_10.c Sat Jan 18 08:28:25 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_10.c,v 1.14 2002/10/23 13:16:40 scw Exp $ */
+/* $NetBSD: netbsd32_compat_10.c,v 1.15 2003/01/18 08:28:25 thorpej Exp $ */
/*
* Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_10.c,v 1.14 2002/10/23 13:16:40 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_10.c,v 1.15 2003/01/18 08:28:25 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -45,6 +45,7 @@
#include <sys/malloc.h>
#include <sys/mount.h>
+#include <sys/sa.h>
#include <sys/syscallargs.h>
#include <compat/netbsd32/netbsd32.h>
@@ -52,11 +53,12 @@
#if defined(SYSVSEM) || !defined(_KERNEL)
int
-compat_10_netbsd32_sys_semsys(p, v, retval)
- struct proc *p;
+compat_10_netbsd32_sys_semsys(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
+ struct proc *p = l->l_proc;
struct compat_10_netbsd32_sys_semsys_args /* {
syscallarg(int) which;
syscallarg(int) a2;
@@ -94,24 +96,24 @@
sizeof(union semun *));
copyout(&SCARG(uap, a5), SCARG(&__semctl_args, arg),
sizeof(union __semun));
- return (compat_14_sys___semctl(p, &__semctl_args, retval));
+ return (compat_14_sys___semctl(l, &__semctl_args, retval));
case 1: /* semget() */
SCARG(&semget_args, key) = SCARG(uap, a2);
SCARG(&semget_args, nsems) = SCARG(uap, a3);
SCARG(&semget_args, semflg) = SCARG(uap, a4);
- return (sys_semget(p, &semget_args, retval));
+ return (sys_semget(l, &semget_args, retval));
case 2: /* semop() */
SCARG(&semop_args, semid) = SCARG(uap, a2);
SCARG(&semop_args, sops) =
(struct sembuf *)NETBSD32PTR64(SCARG(uap, a3));
SCARG(&semop_args, nsops) = SCARG(uap, a4);
- return (sys_semop(p, &semop_args, retval));
+ return (sys_semop(l, &semop_args, retval));
case 3: /* semconfig() */
SCARG(&semconfig_args, flag) = SCARG(uap, a2);
- return (sys_semconfig(p, &semconfig_args, retval));
+ return (sys_semconfig(l, &semconfig_args, retval));
default:
return (EINVAL);
@@ -121,8 +123,8 @@
#if defined(SYSVSHM) || !defined(_KERNEL)
int
-compat_10_netbsd32_sys_shmsys(p, v, retval)
- struct proc *p;
+compat_10_netbsd32_sys_shmsys(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -157,25 +159,25 @@
SCARG(&shmat_args, shmaddr) =
(void *)NETBSD32PTR64(SCARG(uap, a3));
SCARG(&shmat_args, shmflg) = SCARG(uap, a4);
- return (sys_shmat(p, &shmat_args, retval));
+ return (sys_shmat(l, &shmat_args, retval));
case 1: /* shmctl() */
SCARG(&shmctl_args, shmid) = SCARG(uap, a2);
SCARG(&shmctl_args, cmd) = SCARG(uap, a3);
SCARG(&shmctl_args, buf) =
(struct shmid_ds14 *)NETBSD32PTR64(SCARG(uap, a4));
- return (compat_14_sys_shmctl(p, &shmctl_args, retval));
+ return (compat_14_sys_shmctl(l, &shmctl_args, retval));
case 2: /* shmdt() */
SCARG(&shmdt_args, shmaddr) =
(void *)NETBSD32PTR64(SCARG(uap, a2));
- return (sys_shmdt(p, &shmdt_args, retval));
+ return (sys_shmdt(l, &shmdt_args, retval));
case 3: /* shmget() */
SCARG(&shmget_args, key) = SCARG(uap, a2);
SCARG(&shmget_args, size) = SCARG(uap, a3);
SCARG(&shmget_args, shmflg) = SCARG(uap, a4);
- return (sys_shmget(p, &shmget_args, retval));
+ return (sys_shmget(l, &shmget_args, retval));
default:
return (EINVAL);
@@ -185,8 +187,8 @@
#if defined(SYSVMSG) || !defined(_KERNEL)
int
-compat_10_netbsd32_sys_msgsys(p, v, retval)
- struct proc *p;
+compat_10_netbsd32_sys_msgsys(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -227,12 +229,12 @@
SCARG(&msgctl_args, cmd) = SCARG(uap, a3);
SCARG(&msgctl_args, buf) =
(struct msqid_ds14 *)NETBSD32PTR64(SCARG(uap, a4));
- return (compat_14_sys_msgctl(p, &msgctl_args, retval));
+ return (compat_14_sys_msgctl(l, &msgctl_args, retval));
case 1: /* msgget() */
SCARG(&msgget_args, key) = SCARG(uap, a2);
SCARG(&msgget_args, msgflg) = SCARG(uap, a3);
- return (sys_msgget(p, &msgget_args, retval));
+ return (sys_msgget(l, &msgget_args, retval));
case 2: /* msgsnd() */
SCARG(&msgsnd_args, msqid) = SCARG(uap, a2);
@@ -240,7 +242,7 @@
(void *)NETBSD32PTR64(SCARG(uap, a3));
SCARG(&msgsnd_args, msgsz) = SCARG(uap, a4);
SCARG(&msgsnd_args, msgflg) = SCARG(uap, a5);
- return (sys_msgsnd(p, &msgsnd_args, retval));
+ return (sys_msgsnd(l, &msgsnd_args, retval));
case 3: /* msgrcv() */
SCARG(&msgrcv_args, msqid) = SCARG(uap, a2);
@@ -249,7 +251,7 @@
SCARG(&msgrcv_args, msgsz) = SCARG(uap, a4);
SCARG(&msgrcv_args, msgtyp) = SCARG(uap, a5);
SCARG(&msgrcv_args, msgflg) = SCARG(uap, a6);
- return (sys_msgrcv(p, &msgrcv_args, retval));
+ return (sys_msgrcv(l, &msgrcv_args, retval));
default:
return (EINVAL);
diff -r acd79e44fa61 -r dd61d8247ad8 sys/compat/netbsd32/netbsd32_compat_12.c
--- a/sys/compat/netbsd32/netbsd32_compat_12.c Sat Jan 18 08:19:32 2003 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_12.c Sat Jan 18 08:28:25 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.15 2002/10/23 13:16:41 scw Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.16 2003/01/18 08:28:25 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.15 2002/10/23 13:16:41 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.16 2003/01/18 08:28:25 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -42,6 +42,7 @@
#include <sys/proc.h>
#include <sys/stat.h>
#include <sys/swap.h>
+#include <sys/sa.h>
#include <sys/syscallargs.h>
#include <compat/netbsd32/netbsd32.h>
@@ -81,8 +82,8 @@
}
int
-compat_12_netbsd32_reboot(p, v, retval)
- struct proc *p;
Home |
Main Index |
Thread Index |
Old Index