From 911fd86e93038a1544faffe943ea1e1b5ccf80df Mon Sep 17 00:00:00 2001 From: thorpej Date: Fri, 11 Sep 1998 22:37:53 +0000 Subject: [PATCH] Regen; signal changes. (mycroft must have forgotten to commit this) --- sys/kern/syscalls.c | 16 +++++++++------ sys/sys/syscall.h | 30 +++++++++++++++++---------- sys/sys/syscallargs.h | 48 ++++++++++++++++++++++++++++++++----------- 3 files changed, 65 insertions(+), 29 deletions(-) diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index ebf120e2fccf..192ef13cfa52 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $NetBSD: syscalls.c,v 1.88 1998/07/05 08:49:49 jonathan Exp $ */ +/* $NetBSD: syscalls.c,v 1.89 1998/09/11 22:37:53 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.80 1998/07/02 01:23:33 thorpej Exp + * created from NetBSD: syscalls.master,v 1.82 1998/09/11 12:50:11 mycroft Exp */ #if defined(_KERNEL) && !defined(_LKM) @@ -71,13 +71,13 @@ char *syscallnames[] = { #else "#45 (unimplemented ktrace)", /* 45 = unimplemented ktrace */ #endif - "sigaction", /* 46 = sigaction */ + "compat_13_sigaction13", /* 46 = compat_13 sigaction13 */ "getgid", /* 47 = getgid */ - "sigprocmask", /* 48 = sigprocmask */ + "compat_13_sigprocmask13", /* 48 = compat_13 sigprocmask13 */ "__getlogin", /* 49 = __getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "sigpending", /* 52 = sigpending */ + "compat_13_sigpending13", /* 52 = compat_13 sigpending13 */ "compat_13_sigaltstack13", /* 53 = compat_13 sigaltstack13 */ "ioctl", /* 54 = ioctl */ "compat_12_oreboot", /* 55 = compat_12 oreboot */ @@ -136,7 +136,7 @@ char *syscallnames[] = { "compat_43_osigvec", /* 108 = compat_43 osigvec */ "compat_43_osigblock", /* 109 = compat_43 osigblock */ "compat_43_osigsetmask", /* 110 = compat_43 osigsetmask */ - "sigsuspend", /* 111 = sigsuspend */ + "compat_13_sigsuspend13", /* 111 = compat_13 sigsuspend13 */ "compat_43_osigstack", /* 112 = compat_43 osigstack */ "compat_43_orecvmsg", /* 113 = compat_43 orecvmsg */ "compat_43_osendmsg", /* 114 = compat_43 osendmsg */ @@ -385,4 +385,8 @@ char *syscallnames[] = { #endif "preadv", /* 289 = preadv */ "pwritev", /* 290 = pwritev */ + "__sigaction14", /* 291 = __sigaction14 */ + "__sigpending14", /* 292 = __sigpending14 */ + "__sigprocmask14", /* 293 = __sigprocmask14 */ + "__sigsuspend14", /* 294 = __sigsuspend14 */ }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index cf83fa916c66..ff0675f02d72 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.87 1998/07/02 01:24:25 thorpej Exp $ */ +/* $NetBSD: syscall.h,v 1.88 1998/09/11 22:37:54 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.80 1998/07/02 01:23:33 thorpej Exp + * created from NetBSD: syscalls.master,v 1.82 1998/09/11 12:50:11 mycroft Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -139,14 +139,12 @@ /* syscall: "ktrace" ret: "int" args: "const char *" "int" "int" "int" */ #define SYS_ktrace 45 -/* syscall: "sigaction" ret: "int" args: "int" "const struct sigaction *" "struct sigaction *" */ -#define SYS_sigaction 46 + /* 46 is compat_13 sigaction13 */ /* syscall: "getgid" ret: "gid_t" args: */ #define SYS_getgid 47 -/* syscall: "sigprocmask" ret: "int" args: "int" "sigset_t" */ -#define SYS_sigprocmask 48 + /* 48 is compat_13 sigprocmask13 */ /* syscall: "__getlogin" ret: "int" args: "char *" "u_int" */ #define SYS___getlogin 49 @@ -157,8 +155,7 @@ /* syscall: "acct" ret: "int" args: "const char *" */ #define SYS_acct 51 -/* syscall: "sigpending" ret: "int" args: */ -#define SYS_sigpending 52 + /* 52 is compat_13 sigpending13 */ /* 53 is compat_13 sigaltstack13 */ @@ -300,8 +297,7 @@ /* 110 is compat_43 osigsetmask */ -/* syscall: "sigsuspend" ret: "int" args: "int" */ -#define SYS_sigsuspend 111 + /* 111 is compat_13 sigsuspend13 */ /* 112 is compat_43 osigstack */ @@ -635,4 +631,16 @@ /* syscall: "pwritev" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */ #define SYS_pwritev 290 -#define SYS_MAXSYSCALL 291 +/* syscall: "__sigaction14" ret: "int" args: "int" "const struct sigaction *" "struct sigaction *" */ +#define SYS___sigaction14 291 + +/* syscall: "__sigpending14" ret: "int" args: "sigset_t *" */ +#define SYS___sigpending14 292 + +/* syscall: "__sigprocmask14" ret: "int" args: "int" "const sigset_t *" "sigset_t *" */ +#define SYS___sigprocmask14 293 + +/* syscall: "__sigsuspend14" ret: "int" args: "const sigset_t *" */ +#define SYS___sigsuspend14 294 + +#define SYS_MAXSYSCALL 295 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index 6fbb0c4ef774..9491acfebc0e 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.66 1998/07/02 01:24:25 thorpej Exp $ */ +/* $NetBSD: syscallargs.h,v 1.67 1998/09/11 22:37:55 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.80 1998/07/02 01:23:33 thorpej Exp + * created from NetBSD: syscalls.master,v 1.82 1998/09/11 12:50:11 mycroft Exp */ #define syscallarg(x) union { x datum; register_t pad; } @@ -207,15 +207,15 @@ struct sys_ktrace_args { syscallarg(int) pid; }; -struct sys_sigaction_args { +struct compat_13_sys_sigaction_args { syscallarg(int) signum; - syscallarg(const struct sigaction *) nsa; - syscallarg(struct sigaction *) osa; + syscallarg(const struct sigaction13 *) nsa; + syscallarg(struct sigaction13 *) osa; }; -struct sys_sigprocmask_args { +struct compat_13_sys_sigprocmask_args { syscallarg(int) how; - syscallarg(sigset_t) mask; + syscallarg(int) mask; }; struct sys___getlogin_args { @@ -479,7 +479,7 @@ struct compat_43_sys_sigsetmask_args { syscallarg(int) mask; }; -struct sys_sigsuspend_args { +struct compat_13_sys_sigsuspend_args { syscallarg(int) mask; }; @@ -1120,6 +1120,26 @@ struct sys_pwritev_args { syscallarg(off_t) offset; }; +struct sys___sigaction14_args { + syscallarg(int) signum; + syscallarg(const struct sigaction *) nsa; + syscallarg(struct sigaction *) osa; +}; + +struct sys___sigpending14_args { + syscallarg(sigset_t *) set; +}; + +struct sys___sigprocmask14_args { + syscallarg(int) how; + syscallarg(const sigset_t *) set; + syscallarg(sigset_t *) oset; +}; + +struct sys___sigsuspend14_args { + syscallarg(const sigset_t *) set; +}; + /* * System call prototypes. */ @@ -1171,13 +1191,13 @@ int sys_profil __P((struct proc *, void *, register_t *)); int sys_ktrace __P((struct proc *, void *, register_t *)); #else #endif -int sys_sigaction __P((struct proc *, void *, register_t *)); +int compat_13_sys_sigaction __P((struct proc *, void *, register_t *)); int sys_getgid __P((struct proc *, void *, register_t *)); -int sys_sigprocmask __P((struct proc *, void *, register_t *)); +int compat_13_sys_sigprocmask __P((struct proc *, void *, register_t *)); int sys___getlogin __P((struct proc *, void *, register_t *)); int sys_setlogin __P((struct proc *, void *, register_t *)); int sys_acct __P((struct proc *, void *, register_t *)); -int sys_sigpending __P((struct proc *, void *, register_t *)); +int compat_13_sys_sigpending __P((struct proc *, void *, register_t *)); int compat_13_sys_sigaltstack __P((struct proc *, void *, register_t *)); int sys_ioctl __P((struct proc *, void *, register_t *)); int compat_12_sys_reboot __P((struct proc *, void *, register_t *)); @@ -1229,7 +1249,7 @@ int sys_listen __P((struct proc *, void *, register_t *)); int compat_43_sys_sigvec __P((struct proc *, void *, register_t *)); int compat_43_sys_sigblock __P((struct proc *, void *, register_t *)); int compat_43_sys_sigsetmask __P((struct proc *, void *, register_t *)); -int sys_sigsuspend __P((struct proc *, void *, register_t *)); +int compat_13_sys_sigsuspend __P((struct proc *, void *, register_t *)); int compat_43_sys_sigstack __P((struct proc *, void *, register_t *)); int compat_43_sys_recvmsg __P((struct proc *, void *, register_t *)); int compat_43_sys_sendmsg __P((struct proc *, void *, register_t *)); @@ -1393,3 +1413,7 @@ int sys_fktrace __P((struct proc *, void *, register_t *)); #endif int sys_preadv __P((struct proc *, void *, register_t *)); int sys_pwritev __P((struct proc *, void *, register_t *)); +int sys___sigaction14 __P((struct proc *, void *, register_t *)); +int sys___sigpending14 __P((struct proc *, void *, register_t *)); +int sys___sigprocmask14 __P((struct proc *, void *, register_t *)); +int sys___sigsuspend14 __P((struct proc *, void *, register_t *));