Module Name: src Committed By: christos Date: Thu May 10 02:36:26 UTC 2018
Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132 -r1.133 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.13 -r1.14 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.24 -r1.25 src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/netbsd32/netbsd32_syscall.h diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134 src/sys/compat/netbsd32/netbsd32_syscall.h:1.135 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134 Sat Jan 6 11:41:23 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed May 9 22:36:26 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134 2018/01/06 16:41:23 kamil Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.135 2018/05/10 02:36:26 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp + * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -1241,6 +1241,12 @@ /* syscall: "netbsd32_posix_spawn" ret: "int" args: "netbsd32_pid_tp" "const netbsd32_charp" "const netbsd32_posix_spawn_file_actionsp" "const netbsd32_posix_spawnattrp" "netbsd32_charpp" "netbsd32_charpp" */ #define NETBSD32_SYS_netbsd32_posix_spawn 474 +/* syscall: "netbsd32_recvmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" "netbsd32_timespecp_t" */ +#define NETBSD32_SYS_netbsd32_recvmmsg 475 + +/* syscall: "netbsd32_sendmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" */ +#define NETBSD32_SYS_netbsd32_sendmmsg 476 + /* syscall: "netbsd32_clock_nanosleep" ret: "int" args: "netbsd32_clockid_t" "int" "const netbsd32_timespecp_t" "netbsd32_timespecp_t" */ #define NETBSD32_SYS_netbsd32_clock_nanosleep 477 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.135 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134 Sat Jan 6 11:41:23 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed May 9 22:36:26 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134 2018/01/06 16:41:23 kamil Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.135 2018/05/10 02:36:26 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp + * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -2542,6 +2542,23 @@ struct netbsd32_posix_spawn_args { }; check_syscall_args(netbsd32_posix_spawn) +struct netbsd32_recvmmsg_args { + syscallarg(int) s; + syscallarg(netbsd32_mmsghdrp_t) mmsg; + syscallarg(unsigned int) vlen; + syscallarg(unsigned int) flags; + syscallarg(netbsd32_timespecp_t) timeout; +}; +check_syscall_args(netbsd32_recvmmsg) + +struct netbsd32_sendmmsg_args { + syscallarg(int) s; + syscallarg(netbsd32_mmsghdrp_t) mmsg; + syscallarg(unsigned int) vlen; + syscallarg(unsigned int) flags; +}; +check_syscall_args(netbsd32_sendmmsg) + struct netbsd32_clock_nanosleep_args { syscallarg(netbsd32_clockid_t) clock_id; syscallarg(int) flags; @@ -3400,6 +3417,10 @@ int netbsd32___quotactl(struct lwp *, co int netbsd32_posix_spawn(struct lwp *, const struct netbsd32_posix_spawn_args *, register_t *); +int netbsd32_recvmmsg(struct lwp *, const struct netbsd32_recvmmsg_args *, register_t *); + +int netbsd32_sendmmsg(struct lwp *, const struct netbsd32_sendmmsg_args *, register_t *); + int netbsd32_clock_nanosleep(struct lwp *, const struct netbsd32_clock_nanosleep_args *, register_t *); int netbsd32____lwp_park60(struct lwp *, const struct netbsd32____lwp_park60_args *, register_t *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.133 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132 Sat Jan 6 11:41:23 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed May 9 22:36:26 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132 2018/01/06 16:41:23 kamil Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.133 2018/05/10 02:36:26 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp + * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132 2018/01/06 16:41:23 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.133 2018/05/10 02:36:26 christos Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -516,8 +516,8 @@ const char *const netbsd32_syscallnames[ /* 472 */ "netbsd32_futimens", /* 473 */ "netbsd32___quotactl", /* 474 */ "netbsd32_posix_spawn", - /* 475 */ "#475 (unimplemented { int | netbsd32 | | recvmmsg ( int s , struct mmsghdr * mmsg , unsigned int vlen , unsigned int flags , netbsd32_timespecp_t timeout ) ; })", - /* 476 */ "#476 (unimplemented { int | netbsd32 | | sendmmsg ( int s , struct mmsghdr * mmsg , unsigned int vlen , unsigned int flags ) ; })", + /* 475 */ "netbsd32_recvmmsg", + /* 476 */ "netbsd32_sendmmsg", /* 477 */ "netbsd32_clock_nanosleep", /* 478 */ "netbsd32____lwp_park60", /* 479 */ "netbsd32_posix_fallocate", @@ -1046,8 +1046,8 @@ const char *const altnetbsd32_syscallnam /* 472 */ "futimens", /* 473 */ "__quotactl", /* 474 */ "posix_spawn", - /* 475 */ NULL, /* unimplemented { int | netbsd32 | | recvmmsg ( int s , struct mmsghdr * mmsg , unsigned int vlen , unsigned int flags , netbsd32_timespecp_t timeout ) ; } */ - /* 476 */ NULL, /* unimplemented { int | netbsd32 | | sendmmsg ( int s , struct mmsghdr * mmsg , unsigned int vlen , unsigned int flags ) ; } */ + /* 475 */ "recvmmsg", + /* 476 */ "sendmmsg", /* 477 */ "clock_nanosleep", /* 478 */ "_lwp_park", /* 479 */ "posix_fallocate", Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.132 src/sys/compat/netbsd32/netbsd32_sysent.c:1.133 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.132 Sat Jan 6 11:41:23 2018 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Wed May 9 22:36:26 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.132 2018/01/06 16:41:23 kamil Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.133 2018/05/10 02:36:26 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp + * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132 2018/01/06 16:41:23 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.133 2018/05/10 02:36:26 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -1950,11 +1950,13 @@ struct sysent netbsd32_sysent[] = { .sy_call = (sy_call_t *)netbsd32_posix_spawn }, /* 474 = netbsd32_posix_spawn */ { - .sy_call = sys_nosys, - }, /* 475 = filler */ - { - .sy_call = sys_nosys, - }, /* 476 = filler */ + ns(struct netbsd32_recvmmsg_args), + .sy_call = (sy_call_t *)netbsd32_recvmmsg + }, /* 475 = netbsd32_recvmmsg */ + { + ns(struct netbsd32_sendmmsg_args), + .sy_call = (sy_call_t *)netbsd32_sendmmsg + }, /* 476 = netbsd32_sendmmsg */ { ns(struct netbsd32_clock_nanosleep_args), .sy_call = (sy_call_t *)netbsd32_clock_nanosleep Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.14 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13 Sat Jan 6 11:41:23 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed May 9 22:36:26 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13 2018/01/06 16:41:23 kamil Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.14 2018/05/10 02:36:26 christos Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.115 2016/10/19 09:44:01 skrll Exp + * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13 2018/01/06 16:41:23 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.14 2018/05/10 02:36:26 christos Exp $"); #include <sys/proc.h> static struct sc_autoload netbsd32_syscalls_autoload[] = { Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.25 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24 Sat Jan 6 11:41:23 2018 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Wed May 9 22:36:26 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.24 2018/01/06 16:41:23 kamil Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.25 2018/05/10 02:36:26 christos Exp $ */ /* * System call argument to DTrace register array converstion. @@ -3394,6 +3394,27 @@ systrace_args(register_t sysnum, const v *n_args = 6; break; } + /* netbsd32_recvmmsg */ + case 475: { + const struct netbsd32_recvmmsg_args *p = params; + iarg[0] = SCARG(p, s); /* int */ + uarg[1] = (intptr_t) SCARG(p, mmsg).i32; /* netbsd32_mmsghdrp_t */ + uarg[2] = SCARG(p, vlen); /* unsigned int */ + uarg[3] = SCARG(p, flags); /* unsigned int */ + uarg[4] = (intptr_t) SCARG(p, timeout).i32; /* netbsd32_timespecp_t */ + *n_args = 5; + break; + } + /* netbsd32_sendmmsg */ + case 476: { + const struct netbsd32_sendmmsg_args *p = params; + iarg[0] = SCARG(p, s); /* int */ + uarg[1] = (intptr_t) SCARG(p, mmsg).i32; /* netbsd32_mmsghdrp_t */ + uarg[2] = SCARG(p, vlen); /* unsigned int */ + uarg[3] = SCARG(p, flags); /* unsigned int */ + *n_args = 4; + break; + } /* netbsd32_clock_nanosleep */ case 477: { const struct netbsd32_clock_nanosleep_args *p = params; @@ -9202,6 +9223,47 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* netbsd32_recvmmsg */ + case 475: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "netbsd32_mmsghdrp_t"; + break; + case 2: + p = "unsigned int"; + break; + case 3: + p = "unsigned int"; + break; + case 4: + p = "netbsd32_timespecp_t"; + break; + default: + break; + }; + break; + /* netbsd32_sendmmsg */ + case 476: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "netbsd32_mmsghdrp_t"; + break; + case 2: + p = "unsigned int"; + break; + case 3: + p = "unsigned int"; + break; + default: + break; + }; + break; /* netbsd32_clock_nanosleep */ case 477: switch(ndx) { @@ -11252,6 +11314,16 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* netbsd32_recvmmsg */ + case 475: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* netbsd32_sendmmsg */ + case 476: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* netbsd32_clock_nanosleep */ case 477: if (ndx == 0 || ndx == 1)