diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/init_sysent.c | 49 | ||||
| -rw-r--r-- | sys/kern/syscalls.c | 31 | ||||
| -rw-r--r-- | sys/sys/syscall.h | 33 | ||||
| -rw-r--r-- | sys/sys/syscallargs.h | 75 |
4 files changed, 135 insertions, 53 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 82c2255e55f..c31c1fdca1d 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $NetBSD: init_sysent.c,v 1.110 1999/07/12 23:01:47 thorpej Exp $ */ +/* $NetBSD: init_sysent.c,v 1.111 1999/08/25 05:06:32 thorpej Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.96 1999/07/12 23:01:27 thorpej Exp + * created from NetBSD: syscalls.master,v 1.97 1999/08/25 05:05:48 thorpej Exp */ #include "opt_ktrace.h" @@ -56,6 +56,12 @@ #define compat_13(func) sys_nosys #endif +#ifdef COMPAT_14 +#define compat_14(func) __CONCAT(compat_14_,func) +#else +#define compat_14(func) sys_nosys +#endif + #define s(type) sizeof(type) struct sysent sysent[] = { @@ -559,8 +565,8 @@ struct sysent sysent[] = { sys_nosys }, /* 219 = excluded lkmnosys */ #endif /* !LKM */ #if defined(SYSVSEM) || !defined(_KERNEL) - { 4, s(struct sys___semctl_args), - sys___semctl }, /* 220 = __semctl */ + { 4, s(struct compat_14_sys___semctl_args), + compat_14(sys___semctl) }, /* 220 = compat_14 __semctl */ { 3, s(struct sys_semget_args), sys_semget }, /* 221 = semget */ { 3, s(struct sys_semop_args), @@ -569,7 +575,7 @@ struct sysent sysent[] = { sys_semconfig }, /* 223 = semconfig */ #else { 0, 0, - sys_nosys }, /* 220 = excluded semctl */ + sys_nosys }, /* 220 = excluded compat_14_semctl */ { 0, 0, sys_nosys }, /* 221 = excluded semget */ { 0, 0, @@ -578,8 +584,8 @@ struct sysent sysent[] = { sys_nosys }, /* 223 = excluded semconfig */ #endif #if defined(SYSVMSG) || !defined(_KERNEL) - { 3, s(struct sys_msgctl_args), - sys_msgctl }, /* 224 = msgctl */ + { 3, s(struct compat_14_sys_msgctl_args), + compat_14(sys_msgctl) }, /* 224 = compat_14 msgctl */ { 2, s(struct sys_msgget_args), sys_msgget }, /* 225 = msgget */ { 4, s(struct sys_msgsnd_args), @@ -588,7 +594,7 @@ struct sysent sysent[] = { sys_msgrcv }, /* 227 = msgrcv */ #else { 0, 0, - sys_nosys }, /* 224 = excluded msgctl */ + sys_nosys }, /* 224 = excluded compat_14_msgctl */ { 0, 0, sys_nosys }, /* 225 = excluded msgget */ { 0, 0, @@ -599,8 +605,8 @@ struct sysent sysent[] = { #if defined(SYSVSHM) || !defined(_KERNEL) { 3, s(struct sys_shmat_args), sys_shmat }, /* 228 = shmat */ - { 3, s(struct sys_shmctl_args), - sys_shmctl }, /* 229 = shmctl */ + { 3, s(struct compat_14_sys_shmctl_args), + compat_14(sys_shmctl) }, /* 229 = compat_14 shmctl */ { 1, s(struct sys_shmdt_args), sys_shmdt }, /* 230 = shmdt */ { 3, s(struct sys_shmget_args), @@ -609,7 +615,7 @@ struct sysent sysent[] = { { 0, 0, sys_nosys }, /* 228 = excluded shmat */ { 0, 0, - sys_nosys }, /* 229 = excluded shmctl */ + sys_nosys }, /* 229 = excluded compat_14_shmctl */ { 0, 0, sys_nosys }, /* 230 = excluded shmdt */ { 0, 0, @@ -758,5 +764,26 @@ struct sysent sysent[] = { sys_fhstat }, /* 299 = fhstat */ { 2, s(struct sys_fhstatfs_args), sys_fhstatfs }, /* 300 = fhstatfs */ +#if defined(SYSVSEM) || !defined(_KERNEL) + { 4, s(struct sys___semctl13_args), + sys___semctl13 }, /* 301 = __semctl13 */ +#else + { 0, 0, + sys_nosys }, /* 301 = excluded __semctl13 */ +#endif +#if defined(SYSVMSG) || !defined(_KERNEL) + { 3, s(struct sys___msgctl13_args), + sys___msgctl13 }, /* 302 = __msgctl13 */ +#else + { 0, 0, + sys_nosys }, /* 302 = excluded __msgctl13 */ +#endif +#if defined(SYSVSHM) || !defined(_KERNEL) + { 3, s(struct sys___shmctl13_args), + sys___shmctl13 }, /* 303 = __shmctl13 */ +#else + { 0, 0, + sys_nosys }, /* 303 = excluded __shmctl13 */ +#endif }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 845deb2f885..6b90bc1d134 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $NetBSD: syscalls.c,v 1.104 1999/07/12 23:01:47 thorpej Exp $ */ +/* $NetBSD: syscalls.c,v 1.105 1999/08/25 05:06:32 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.96 1999/07/12 23:01:27 thorpej Exp + * created from NetBSD: syscalls.master,v 1.97 1999/08/25 05:05:48 thorpej Exp */ #if defined(_KERNEL) && !defined(_LKM) @@ -284,35 +284,35 @@ char *syscallnames[] = { "#219 (excluded lkmnosys)", /* 219 = excluded lkmnosys */ #endif /* !LKM */ #if defined(SYSVSEM) || !defined(_KERNEL) - "__semctl", /* 220 = __semctl */ + "compat_14___semctl", /* 220 = compat_14 __semctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ "semconfig", /* 223 = semconfig */ #else - "#220 (excluded semctl)", /* 220 = excluded semctl */ + "#220 (excluded compat_14_semctl)", /* 220 = excluded compat_14_semctl */ "#221 (excluded semget)", /* 221 = excluded semget */ "#222 (excluded semop)", /* 222 = excluded semop */ "#223 (excluded semconfig)", /* 223 = excluded semconfig */ #endif #if defined(SYSVMSG) || !defined(_KERNEL) - "msgctl", /* 224 = msgctl */ + "compat_14_msgctl", /* 224 = compat_14 msgctl */ "msgget", /* 225 = msgget */ "msgsnd", /* 226 = msgsnd */ "msgrcv", /* 227 = msgrcv */ #else - "#224 (excluded msgctl)", /* 224 = excluded msgctl */ + "#224 (excluded compat_14_msgctl)", /* 224 = excluded compat_14_msgctl */ "#225 (excluded msgget)", /* 225 = excluded msgget */ "#226 (excluded msgsnd)", /* 226 = excluded msgsnd */ "#227 (excluded msgrcv)", /* 227 = excluded msgrcv */ #endif #if defined(SYSVSHM) || !defined(_KERNEL) "shmat", /* 228 = shmat */ - "shmctl", /* 229 = shmctl */ + "compat_14_shmctl", /* 229 = compat_14 shmctl */ "shmdt", /* 230 = shmdt */ "shmget", /* 231 = shmget */ #else "#228 (excluded shmat)", /* 228 = excluded shmat */ - "#229 (excluded shmctl)", /* 229 = excluded shmctl */ + "#229 (excluded compat_14_shmctl)", /* 229 = excluded compat_14_shmctl */ "#230 (excluded shmdt)", /* 230 = excluded shmdt */ "#231 (excluded shmget)", /* 231 = excluded shmget */ #endif @@ -389,4 +389,19 @@ char *syscallnames[] = { "fhopen", /* 298 = fhopen */ "fhstat", /* 299 = fhstat */ "fhstatfs", /* 300 = fhstatfs */ +#if defined(SYSVSEM) || !defined(_KERNEL) + "__semctl13", /* 301 = __semctl13 */ +#else + "#301 (excluded __semctl13)", /* 301 = excluded __semctl13 */ +#endif +#if defined(SYSVMSG) || !defined(_KERNEL) + "__msgctl13", /* 302 = __msgctl13 */ +#else + "#302 (excluded __msgctl13)", /* 302 = excluded __msgctl13 */ +#endif +#if defined(SYSVSHM) || !defined(_KERNEL) + "__shmctl13", /* 303 = __shmctl13 */ +#else + "#303 (excluded __shmctl13)", /* 303 = excluded __shmctl13 */ +#endif }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 96eb4ae5cfb..8c7256fd37f 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.103 1999/07/12 23:01:48 thorpej Exp $ */ +/* $NetBSD: syscall.h,v 1.104 1999/08/25 05:06:31 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.96 1999/07/12 23:01:27 thorpej Exp + * created from NetBSD: syscalls.master,v 1.97 1999/08/25 05:05:48 thorpej Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -535,8 +535,7 @@ /* 217 is excluded lkmnosys */ /* 218 is excluded lkmnosys */ /* 219 is excluded lkmnosys */ -/* syscall: "__semctl" ret: "int" args: "int" "int" "int" "union semun *" */ -#define SYS___semctl 220 +#define SYS_compat_14___semctl 220 /* syscall: "semget" ret: "int" args: "key_t" "int" "int" */ #define SYS_semget 221 @@ -547,12 +546,11 @@ /* syscall: "semconfig" ret: "int" args: "int" */ #define SYS_semconfig 223 - /* 220 is excluded semctl */ + /* 220 is excluded compat_14_semctl */ /* 221 is excluded semget */ /* 222 is excluded semop */ /* 223 is excluded semconfig */ -/* syscall: "msgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */ -#define SYS_msgctl 224 +#define SYS_compat_14_msgctl 224 /* syscall: "msgget" ret: "int" args: "key_t" "int" */ #define SYS_msgget 225 @@ -563,15 +561,14 @@ /* syscall: "msgrcv" ret: "ssize_t" args: "int" "void *" "size_t" "long" "int" */ #define SYS_msgrcv 227 - /* 224 is excluded msgctl */ + /* 224 is excluded compat_14_msgctl */ /* 225 is excluded msgget */ /* 226 is excluded msgsnd */ /* 227 is excluded msgrcv */ /* syscall: "shmat" ret: "void *" args: "int" "const void *" "int" */ #define SYS_shmat 228 -/* syscall: "shmctl" ret: "int" args: "int" "int" "struct shmid_ds *" */ -#define SYS_shmctl 229 +#define SYS_compat_14_shmctl 229 /* syscall: "shmdt" ret: "int" args: "const void *" */ #define SYS_shmdt 230 @@ -580,7 +577,7 @@ #define SYS_shmget 231 /* 228 is excluded shmat */ - /* 229 is excluded shmctl */ + /* 229 is excluded compat_14_shmctl */ /* 230 is excluded shmdt */ /* 231 is excluded shmget */ /* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct timespec *" */ @@ -695,4 +692,16 @@ /* syscall: "fhstatfs" ret: "int" args: "const fhandle_t *" "struct statfs *" */ #define SYS_fhstatfs 300 -#define SYS_MAXSYSCALL 301 +/* syscall: "__semctl13" ret: "int" args: "int" "int" "int" "union __semun" */ +#define SYS___semctl13 301 + + /* 301 is excluded __semctl13 */ +/* syscall: "__msgctl13" ret: "int" args: "int" "int" "struct msqid_ds *" */ +#define SYS___msgctl13 302 + + /* 302 is excluded __msgctl13 */ +/* syscall: "__shmctl13" ret: "int" args: "int" "int" "struct shmid_ds *" */ +#define SYS___shmctl13 303 + + /* 303 is excluded __shmctl13 */ +#define SYS_MAXSYSCALL 304 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index 9130f6b8f92..22a1c1f3195 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.84 1999/07/12 23:01:48 thorpej Exp $ */ +/* $NetBSD: syscallargs.h,v 1.85 1999/08/25 05:06:32 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.96 1999/07/12 23:01:27 thorpej Exp + * created from NetBSD: syscalls.master,v 1.97 1999/08/25 05:05:48 thorpej Exp */ #ifndef _SYS__SYSCALLARGS_H_ @@ -14,17 +14,17 @@ #undef syscallarg #endif -#define syscallarg(x) \ - union { \ - register_t pad; \ - struct { x datum; } le; \ - struct { \ - int8_t pad[ (sizeof (register_t) < sizeof (x)) \ - ? 0 \ - : sizeof (register_t) - sizeof (x)]; \ - x datum; \ - } be; \ - } +#define syscallarg(x) \ + union { \ + register_t pad; \ + struct { x datum; } le; \ + struct { \ + int8_t pad[ (sizeof (register_t) < sizeof (x)) \ + ? 0 \ + : sizeof (register_t) - sizeof (x)]; \ + x datum; \ + } be; \ + } struct sys_exit_args { syscallarg(int) rval; @@ -927,11 +927,11 @@ struct sys_poll_args { syscallarg(int) timeout; }; -struct sys___semctl_args { +struct compat_14_sys___semctl_args { syscallarg(int) semid; syscallarg(int) semnum; syscallarg(int) cmd; - syscallarg(union semun *) arg; + syscallarg(union __semun *) arg; }; struct sys_semget_args { @@ -950,10 +950,10 @@ struct sys_semconfig_args { syscallarg(int) flag; }; -struct sys_msgctl_args { +struct compat_14_sys_msgctl_args { syscallarg(int) msqid; syscallarg(int) cmd; - syscallarg(struct msqid_ds *) buf; + syscallarg(struct msqid_ds14 *) buf; }; struct sys_msgget_args { @@ -982,10 +982,10 @@ struct sys_shmat_args { syscallarg(int) shmflg; }; -struct sys_shmctl_args { +struct compat_14_sys_shmctl_args { syscallarg(int) shmid; syscallarg(int) cmd; - syscallarg(struct shmid_ds *) buf; + syscallarg(struct shmid_ds14 *) buf; }; struct sys_shmdt_args { @@ -1184,6 +1184,25 @@ struct sys_fhstatfs_args { syscallarg(struct statfs *) buf; }; +struct sys___semctl13_args { + syscallarg(int) semid; + syscallarg(int) semnum; + syscallarg(int) cmd; + syscallarg(union __semun) arg; +}; + +struct sys___msgctl13_args { + syscallarg(int) msqid; + syscallarg(int) cmd; + syscallarg(struct msqid_ds *) buf; +}; + +struct sys___shmctl13_args { + syscallarg(int) shmid; + syscallarg(int) cmd; + syscallarg(struct shmid_ds *) buf; +}; + /* * System call prototypes. */ @@ -1402,14 +1421,14 @@ int sys_lkmnosys __P((struct proc *, void *, register_t *)); #else /* !LKM */ #endif /* !LKM */ #if defined(SYSVSEM) || !defined(_KERNEL) -int sys___semctl __P((struct proc *, void *, register_t *)); +int compat_14_sys___semctl __P((struct proc *, void *, register_t *)); int sys_semget __P((struct proc *, void *, register_t *)); int sys_semop __P((struct proc *, void *, register_t *)); int sys_semconfig __P((struct proc *, void *, register_t *)); #else #endif #if defined(SYSVMSG) || !defined(_KERNEL) -int sys_msgctl __P((struct proc *, void *, register_t *)); +int compat_14_sys_msgctl __P((struct proc *, void *, register_t *)); int sys_msgget __P((struct proc *, void *, register_t *)); int sys_msgsnd __P((struct proc *, void *, register_t *)); int sys_msgrcv __P((struct proc *, void *, register_t *)); @@ -1417,7 +1436,7 @@ int sys_msgrcv __P((struct proc *, void *, register_t *)); #endif #if defined(SYSVSHM) || !defined(_KERNEL) int sys_shmat __P((struct proc *, void *, register_t *)); -int sys_shmctl __P((struct proc *, void *, register_t *)); +int compat_14_sys_shmctl __P((struct proc *, void *, register_t *)); int sys_shmdt __P((struct proc *, void *, register_t *)); int sys_shmget __P((struct proc *, void *, register_t *)); #else @@ -1462,4 +1481,16 @@ int sys_fchroot __P((struct proc *, void *, register_t *)); int sys_fhopen __P((struct proc *, void *, register_t *)); int sys_fhstat __P((struct proc *, void *, register_t *)); int sys_fhstatfs __P((struct proc *, void *, register_t *)); +#if defined(SYSVSEM) || !defined(_KERNEL) +int sys___semctl13 __P((struct proc *, void *, register_t *)); +#else +#endif +#if defined(SYSVMSG) || !defined(_KERNEL) +int sys___msgctl13 __P((struct proc *, void *, register_t *)); +#else +#endif +#if defined(SYSVSHM) || !defined(_KERNEL) +int sys___shmctl13 __P((struct proc *, void *, register_t *)); +#else +#endif #endif /* _SYS__SYSCALLARGS_H_ */ |
