Module Name: src Committed By: christos Date: Thu Oct 3 16:51:35 UTC 2024
Modified Files: src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.343 -r1.344 src/sys/kern/init_sysent.c cvs rdiff -u -r1.331 -r1.332 src/sys/kern/syscalls.c cvs rdiff -u -r1.47 -r1.48 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.53 -r1.54 src/sys/kern/systrace_args.c cvs rdiff -u -r1.130 -r1.131 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.161 -r1.162 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.326 -r1.327 src/sys/sys/syscall.h cvs rdiff -u -r1.309 -r1.310 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.343 src/sys/kern/init_sysent.c:1.344 --- src/sys/kern/init_sysent.c:1.343 Sun May 19 21:40:44 2024 +++ src/sys/kern/init_sysent.c Thu Oct 3 12:51:34 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.343 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: init_sysent.c,v 1.344 2024/10/03 16:51:34 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp + * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.343 2024/05/20 01:40:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.344 2024/10/03 16:51:34 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -2478,8 +2478,10 @@ struct sysent sysent[] = { .sy_call = (sy_call_t *)sys___dup3100 }, /* 505 = __dup3100 */ { - .sy_call = sys_nosys, - }, /* 506 = filler */ + ns(struct sys_semtimedop_args), + .sy_flags = SYCALL_ARG_PTR, + .sy_call = (sy_call_t *)sys_semtimedop + }, /* 506 = semtimedop */ { .sy_call = sys_nosys, }, /* 507 = filler */ Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.331 src/sys/kern/syscalls.c:1.332 --- src/sys/kern/syscalls.c:1.331 Sun May 19 21:40:44 2024 +++ src/sys/kern/syscalls.c Thu Oct 3 12:51:35 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.331 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: syscalls.c,v 1.332 2024/10/03 16:51:35 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp + * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.331 2024/05/20 01:40:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.332 2024/10/03 16:51:35 christos Exp $"); #if defined(_KERNEL_OPT) #ifdef _KERNEL_OPT @@ -556,7 +556,7 @@ const char *const syscallnames[] = { /* 503 */ "epoll_ctl", /* 504 */ "epoll_pwait2", /* 505 */ "__dup3100", - /* 506 */ "# filler", + /* 506 */ "semtimedop", /* 507 */ "# filler", /* 508 */ "# filler", /* 509 */ "# filler", @@ -1093,7 +1093,7 @@ const char *const altsyscallnames[] = { /* 503 */ NULL, /* epoll_ctl */ /* 504 */ NULL, /* epoll_pwait2 */ /* 505 */ "dup3", - /* 506 */ NULL, /* filler */ + /* 506 */ NULL, /* semtimedop */ /* 507 */ NULL, /* filler */ /* 508 */ NULL, /* filler */ /* 509 */ NULL, /* filler */ Index: src/sys/kern/syscalls_autoload.c diff -u src/sys/kern/syscalls_autoload.c:1.47 src/sys/kern/syscalls_autoload.c:1.48 --- src/sys/kern/syscalls_autoload.c:1.47 Sun May 19 21:40:44 2024 +++ src/sys/kern/syscalls_autoload.c Thu Oct 3 12:51:35 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.47 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.48 2024/10/03 16:51:35 christos Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp + * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.47 2024/05/20 01:40:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.48 2024/10/03 16:51:35 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" Index: src/sys/kern/systrace_args.c diff -u src/sys/kern/systrace_args.c:1.53 src/sys/kern/systrace_args.c:1.54 --- src/sys/kern/systrace_args.c:1.53 Sun May 19 21:40:44 2024 +++ src/sys/kern/systrace_args.c Thu Oct 3 12:51:35 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.53 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: systrace_args.c,v 1.54 2024/10/03 16:51:35 christos Exp $ */ /* * System call argument to DTrace register array conversion. @@ -3944,6 +3944,16 @@ systrace_args(register_t sysnum, const v *n_args = 3; break; } + /* sys_semtimedop */ + case 506: { + const struct sys_semtimedop_args *p = params; + iarg[0] = SCARG(p, semid); /* int */ + uarg[1] = (intptr_t) SCARG(p, sops); /* struct sembuf * */ + uarg[2] = SCARG(p, nsops); /* size_t */ + uarg[3] = (intptr_t) SCARG(p, timeout); /* struct timespec * */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -10654,6 +10664,25 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* sys_semtimedop */ + case 506: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct sembuf *"; + break; + case 2: + p = "size_t"; + break; + case 3: + p = "struct timespec *"; + break; + default: + break; + }; + break; default: break; }; @@ -12886,6 +12915,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* sys_semtimedop */ + case 506: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.130 src/sys/rump/include/rump/rump_syscalls.h:1.131 --- src/sys/rump/include/rump/rump_syscalls.h:1.130 Sun May 19 21:40:44 2024 +++ src/sys/rump/include/rump/rump_syscalls.h Thu Oct 3 12:51:35 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.130 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.131 2024/10/03 16:51:35 christos Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp + * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.161 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.162 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.161 Sun May 19 21:40:44 2024 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Thu Oct 3 12:51:35 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.161 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.162 2024/10/03 16:51:35 christos Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp + * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.161 2024/05/20 01:40:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.162 2024/10/03 16:51:35 christos Exp $"); #include <sys/fstypes.h> #include <sys/proc.h> @@ -8660,9 +8660,8 @@ struct sysent rump_sysent[] = { .sy_call = (sy_call_t *)(void *)rumpns_enosys, }, /* 505 = __dup3100 */ { - .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, - }, /* 506 = filler */ +}, /* 506 = semtimedop */ { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.326 src/sys/sys/syscall.h:1.327 --- src/sys/sys/syscall.h:1.326 Sun May 19 21:40:44 2024 +++ src/sys/sys/syscall.h Thu Oct 3 12:51:34 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.326 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: syscall.h,v 1.327 2024/10/03 16:51:34 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp + * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp */ #ifndef _SYS_SYSCALL_H_ @@ -1422,6 +1422,9 @@ /* syscall: "__dup3100" ret: "int" args: "int" "int" "int" */ #define SYS___dup3100 505 -#define SYS_MAXSYSCALL 506 +/* syscall: "semtimedop" ret: "int" args: "int" "struct sembuf *" "size_t" "struct timespec *" */ +#define SYS_semtimedop 506 + +#define SYS_MAXSYSCALL 507 #define SYS_NSYSENT 512 #endif /* _SYS_SYSCALL_H_ */ Index: src/sys/sys/syscallargs.h diff -u src/sys/sys/syscallargs.h:1.309 src/sys/sys/syscallargs.h:1.310 --- src/sys/sys/syscallargs.h:1.309 Sun May 19 21:40:44 2024 +++ src/sys/sys/syscallargs.h Thu Oct 3 12:51:34 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.309 2024/05/20 01:40:44 christos Exp $ */ +/* $NetBSD: syscallargs.h,v 1.310 2024/10/03 16:51:34 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp + * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -3409,6 +3409,16 @@ struct sys___dup3100_args { }; check_syscall_args(sys___dup3100) +#ifndef RUMP_CLIENT +struct sys_semtimedop_args { + syscallarg(int) semid; + syscallarg(struct sembuf *) sops; + syscallarg(size_t) nsops; + syscallarg(struct timespec *) timeout; +}; +check_syscall_args(sys_semtimedop) +#endif /* !RUMP_CLIENT */ + /* * System call prototypes. */ @@ -4345,5 +4355,7 @@ int sys_epoll_pwait2(struct lwp *, const int sys___dup3100(struct lwp *, const struct sys___dup3100_args *, register_t *); +int sys_semtimedop(struct lwp *, const struct sys_semtimedop_args *, register_t *); + #endif /* !RUMP_CLIENT */ #endif /* _SYS_SYSCALLARGS_H_ */