Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/netbsd32 Add netbsd32_compat_14.c
details: https://anonhg.NetBSD.org/src/rev/42fcd48385e6
branches: trunk
changeset: 477094:42fcd48385e6
user: eeh <eeh%NetBSD.org@localhost>
date: Mon Oct 11 01:36:21 1999 +0000
description:
Add netbsd32_compat_14.c
Rename everything from compat_netbsd32 -> netbsd32 so we don't have silly
names like compat_14_compat_netbsd32_sys_shmctl().
diffstat:
sys/compat/netbsd32/files.netbsd32 | 3 +-
sys/compat/netbsd32/netbsd32.h | 51 +-
sys/compat/netbsd32/netbsd32_compat_09.c | 14 +-
sys/compat/netbsd32/netbsd32_compat_10.c | 32 +-
sys/compat/netbsd32/netbsd32_compat_12.c | 38 +-
sys/compat/netbsd32/netbsd32_compat_13.c | 6 +-
sys/compat/netbsd32/netbsd32_compat_14.c | 323 ++++++++++
sys/compat/netbsd32/netbsd32_compat_43.c | 118 +-
sys/compat/netbsd32/netbsd32_exec.c | 4 +-
sys/compat/netbsd32/netbsd32_ioctl.c | 6 +-
sys/compat/netbsd32/netbsd32_netbsd.c | 687 +++++++++++-----------
sys/compat/netbsd32/netbsd32_syscall.h | 737 ++++++++++++------------
sys/compat/netbsd32/netbsd32_syscallargs.h | 834 ++++++++++++++--------------
sys/compat/netbsd32/netbsd32_syscalls.c | 430 +++++++-------
sys/compat/netbsd32/netbsd32_sysent.c | 856 ++++++++++++++--------------
sys/compat/netbsd32/syscalls.conf | 4 +-
sys/compat/netbsd32/syscalls.master | 448 +++++++-------
17 files changed, 2482 insertions(+), 2109 deletions(-)
diffs (truncated from 8931 to 300 lines):
diff -r 044d8a6c7f43 -r 42fcd48385e6 sys/compat/netbsd32/files.netbsd32
--- a/sys/compat/netbsd32/files.netbsd32 Mon Oct 11 01:29:25 1999 +0000
+++ b/sys/compat/netbsd32/files.netbsd32 Mon Oct 11 01:36:21 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.5 1999/04/24 19:17:33 eeh Exp $
+# $NetBSD: files.netbsd32,v 1.6 1999/10/11 01:36:21 eeh Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -14,5 +14,6 @@
file compat/netbsd32/netbsd32_compat_10.c compat_netbsd32 & compat_10
file compat/netbsd32/netbsd32_compat_12.c compat_netbsd32 & compat_12
file compat/netbsd32/netbsd32_compat_13.c compat_netbsd32 & compat_13
+file compat/netbsd32/netbsd32_compat_14.c compat_netbsd32 & compat_14
file compat/netbsd32/netbsd32_compat_43.c compat_netbsd32 & compat_43
file compat/netbsd32/netbsd32_syscalls.c compat_netbsd32 & syscall_debug
diff -r 044d8a6c7f43 -r 42fcd48385e6 sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h Mon Oct 11 01:29:25 1999 +0000
+++ b/sys/compat/netbsd32/netbsd32.h Mon Oct 11 01:36:21 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.8 1999/07/12 21:55:20 kleink Exp $ */
+/* $NetBSD: netbsd32.h,v 1.9 1999/10/11 01:36:22 eeh Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -172,6 +172,15 @@
ushort uid; /* user id */
ushort gid; /* group id */
ushort mode; /* r/w permission */
+ ushort _seq; /* sequence # (to generate unique msg/sem/shm id) */
+ netbsd32_key_t _key; /* user specified msg/sem/shm key */
+};
+struct netbsd32_ipc_perm14 {
+ ushort cuid; /* creator user id */
+ ushort cgid; /* creator group id */
+ ushort uid; /* user id */
+ ushort gid; /* group id */
+ ushort mode; /* r/w permission */
ushort seq; /* sequence # (to generate unique msg/sem/shm id) */
netbsd32_key_t key; /* user specified msg/sem/shm key */
};
@@ -188,8 +197,29 @@
};
typedef u_int32_t netbsd32_msqid_dsp_t;
+typedef u_int32_t netbsd32_msgqnum_t;
+typedef netbsd32_size_t netbsd32_msglen_t;
+
struct netbsd32_msqid_ds {
- struct netbsd32_ipc_perm msg_perm; /* msg queue permission bits */
+ struct netbsd32_ipc_perm msg_perm; /* operation permission strucure */
+ netbsd32_msgqnum_t msg_qnum; /* number of messages in the queue */
+ netbsd32_msglen_t msg_qbytes; /* max # of bytes in the queue */
+ pid_t msg_lspid; /* process ID of last msgsend() */
+ pid_t msg_lrpid; /* process ID of last msgrcv() */
+ time_t msg_stime; /* time of last msgsend() */
+ time_t msg_rtime; /* time of last msgrcv() */
+ time_t msg_ctime; /* time of last change */
+
+ /*
+ * These members are private and used only in the internal
+ * implementation of this interface.
+ */
+ netbsd32_msgp_t _msg_first; /* first message in the queue */
+ netbsd32_msgp_t _msg_last; /* last message in the queue */
+ netbsd32_msglen_t _msg_cbytes; /* # of bytes currently in queue */
+};
+struct netbsd32_msqid_ds14 {
+ struct netbsd32_ipc_perm14 msg_perm; /* msg queue permission bits */
netbsd32_msgp_t msg_first; /* first message in the queue */
netbsd32_msgp_t msg_last; /* last message in the queue */
netbsd32_u_long msg_cbytes; /* number of bytes in use on the queue */
@@ -212,6 +242,19 @@
typedef u_int32_t netbsd32_semid_dsp_t;
struct netbsd32_semid_ds {
struct netbsd32_ipc_perm sem_perm;/* operation permission struct */
+ unsigned short sem_nsems; /* number of sems in set */
+ time_t sem_otime; /* last operation time */
+ time_t sem_ctime; /* last change time */
+
+ /*
+ * These members are private and used only in the internal
+ * implementation of this interface.
+ */
+ netbsd32_semp_t _sem_base; /* pointer to first semaphore in set */
+};
+
+struct netbsd32_semid_ds14 {
+ struct netbsd32_ipc_perm sem_perm;/* operation permission struct */
netbsd32_semp_t sem_base; /* pointer to first semaphore in set */
unsigned short sem_nsems; /* number of sems in set */
time_t sem_otime; /* last operation time */
@@ -248,7 +291,7 @@
time_t shm_atime; /* time of last shmat() */
time_t shm_dtime; /* time of last shmdt() */
time_t shm_ctime; /* time of last change by shmctl() */
- netbsd32_voidp shm_internal; /* sysv stupidity */
+ netbsd32_voidp _shm_internal; /* sysv stupidity */
};
/* from <sys/signal.h> */
@@ -423,7 +466,7 @@
* - type of pointer to above, normally u_int32_t
* void netbsd32_setregs(struct proc *p, struct exec_package *pack,
* u_long stack);
- * int compat_netbsd32_sigreturn(struct proc *p, void *v,
+ * int netbsd32_sigreturn(struct proc *p, void *v,
* register_t *retval);
* void netbsd32_sendsig(sig_t catcher, int sig, int mask, u_long code);
* char netbsd32_esigcode[], netbsd32_sigcode[]
diff -r 044d8a6c7f43 -r 42fcd48385e6 sys/compat/netbsd32/netbsd32_compat_09.c
--- a/sys/compat/netbsd32/netbsd32_compat_09.c Mon Oct 11 01:29:25 1999 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_09.c Mon Oct 11 01:36:21 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.3 1999/03/25 16:58:39 mrg Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.4 1999/10/11 01:36:22 eeh Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -41,12 +41,12 @@
#include <compat/netbsd32/netbsd32_syscallargs.h>
int
-compat_09_compat_netbsd32_ogetdomainname(p, v, retval)
+compat_09_netbsd32_ogetdomainname(p, v, retval)
struct proc *p;
void *v;
register_t *retval;
{
- struct compat_09_compat_netbsd32_ogetdomainname_args /* {
+ struct compat_09_netbsd32_ogetdomainname_args /* {
syscallarg(netbsd32_charp) domainname;
syscallarg(int) len;
} */ *uap = v;
@@ -59,12 +59,12 @@
}
int
-compat_09_compat_netbsd32_osetdomainname(p, v, retval)
+compat_09_netbsd32_osetdomainname(p, v, retval)
struct proc *p;
void *v;
register_t *retval;
{
- struct compat_09_compat_netbsd32_osetdomainname_args /* {
+ struct compat_09_netbsd32_osetdomainname_args /* {
syscallarg(netbsd32_charp) domainname;
syscallarg(int) len;
} */ *uap = v;
@@ -79,12 +79,12 @@
}
int
-compat_09_compat_netbsd32_ouname(p, v, retval)
+compat_09_netbsd32_ouname(p, v, retval)
struct proc *p;
void *v;
register_t *retval;
{
- struct compat_09_compat_netbsd32_uname_args /* {
+ struct compat_09_netbsd32_uname_args /* {
syscallarg(netbsd32_outsnamep_t) name;
} */ *uap = v;
struct compat_09_sys_uname_args ua;
diff -r 044d8a6c7f43 -r 42fcd48385e6 sys/compat/netbsd32/netbsd32_compat_10.c
--- a/sys/compat/netbsd32/netbsd32_compat_10.c Mon Oct 11 01:29:25 1999 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_10.c Mon Oct 11 01:36:21 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_10.c,v 1.3 1999/03/25 16:22:49 mrg Exp $ */
+/* $NetBSD: netbsd32_compat_10.c,v 1.4 1999/10/11 01:36:22 eeh Exp $ */
/*
* Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved.
@@ -52,19 +52,19 @@
#ifdef SYSVSEM
int
-compat_netbsd32_compat_10_sys_semsys(p, v, retval)
+netbsd32_compat_10_sys_semsys(p, v, retval)
struct proc *p;
void *v;
register_t *retval;
{
- struct compat_netbsd32_compat_10_sys_semsys_args /* {
+ struct netbsd32_compat_10_sys_semsys_args /* {
syscallarg(int) which;
syscallarg(int) a2;
syscallarg(int) a3;
syscallarg(int) a4;
syscallarg(int) a5;
} */ *uap = v;
- struct sys___semctl_args /* {
+ struct compat_14_sys___semctl_args /* {
syscallarg(int) semid;
syscallarg(int) semnum;
syscallarg(int) cmd;
@@ -93,8 +93,8 @@
SCARG(&__semctl_args, arg) = stackgap_alloc(&sg,
sizeof(union semun *));
copyout(&SCARG(uap, a5), SCARG(&__semctl_args, arg),
- sizeof(union semun));
- return (sys___semctl(p, &__semctl_args, retval));
+ sizeof(union __semun));
+ return (compat_14_sys___semctl(p, &__semctl_args, retval));
case 1: /* semget() */
SCARG(&semget_args, key) = SCARG(uap, a2);
@@ -120,12 +120,12 @@
#ifdef SYSVSHM
int
-compat_netbsd32_compat_10_sys_shmsys(p, v, retval)
+netbsd32_compat_10_sys_shmsys(p, v, retval)
struct proc *p;
void *v;
register_t *retval;
{
- struct compat_netbsd32_compat_10_sys_shmsys_args /* {
+ struct netbsd32_compat_10_sys_shmsys_args /* {
syscallarg(int) which;
syscallarg(int) a2;
syscallarg(int) a3;
@@ -136,7 +136,7 @@
syscallarg(void *) shmaddr;
syscallarg(int) shmflg;
} */ shmat_args;
- struct sys_shmctl_args /* {
+ struct compat_14_sys_shmctl_args /* {
syscallarg(int) shmid;
syscallarg(int) cmd;
syscallarg(struct shmid_ds *) buf;
@@ -160,8 +160,8 @@
case 1: /* shmctl() */
SCARG(&shmctl_args, shmid) = SCARG(uap, a2);
SCARG(&shmctl_args, cmd) = SCARG(uap, a3);
- SCARG(&shmctl_args, buf) = (struct shmid_ds *)SCARG(uap, a4);
- return (sys_shmctl(p, &shmctl_args, retval));
+ SCARG(&shmctl_args, buf) = (struct shmid_ds14 *)SCARG(uap, a4);
+ return (compat_14_sys_shmctl(p, &shmctl_args, retval));
case 2: /* shmdt() */
SCARG(&shmdt_args, shmaddr) = (void *)SCARG(uap, a2);
@@ -181,12 +181,12 @@
#ifdef SYSVMSG
int
-compat_netbsd32_compat_10_sys_msgsys(p, v, retval)
+netbsd32_compat_10_sys_msgsys(p, v, retval)
struct proc *p;
void *v;
register_t *retval;
{
- struct compat_netbsd32_compat_10_sys_msgsys_args /* {
+ struct netbsd32_compat_10_sys_msgsys_args /* {
syscallarg(int) which;
syscallarg(int) a2;
syscallarg(int) a3;
@@ -194,7 +194,7 @@
syscallarg(int) a5;
syscallarg(int) a6;
} */ *uap = v;
- struct sys_msgctl_args /* {
+ struct compat_14_sys_msgctl_args /* {
syscallarg(int) msqid;
syscallarg(int) cmd;
syscallarg(struct msqid_ds *) buf;
@@ -222,8 +222,8 @@
SCARG(&msgctl_args, msqid) = SCARG(uap, a2);
SCARG(&msgctl_args, cmd) = SCARG(uap, a3);
SCARG(&msgctl_args, buf) =
- (struct msqid_ds *)SCARG(uap, a4);
- return (sys_msgctl(p, &msgctl_args, retval));
+ (struct msqid_ds14 *)SCARG(uap, a4);
+ return (compat_14_sys_msgctl(p, &msgctl_args, retval));
case 1: /* msgget() */
SCARG(&msgget_args, key) = SCARG(uap, a2);
diff -r 044d8a6c7f43 -r 42fcd48385e6 sys/compat/netbsd32/netbsd32_compat_12.c
--- a/sys/compat/netbsd32/netbsd32_compat_12.c Mon Oct 11 01:29:25 1999 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_12.c Mon Oct 11 01:36:21 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.5 1999/03/25 16:58:39 mrg Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.6 1999/10/11 01:36:22 eeh Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -43,7 +43,7 @@
/* for use with {,fl}stat() */
static void
-compat_netbsd32_stat12_to_netbsd32(sp12, sp32)
+netbsd32_stat12_to_netbsd32(sp12, sp32)
struct stat12 *sp12;
struct netbsd32_stat12 *sp32;
{
@@ -72,12 +72,12 @@
}
int
-compat_12_compat_netbsd32_reboot(p, v, retval)
Home |
Main Index |
Thread Index |
Old Index