Module Name: src Committed By: thorpej Date: Sun Apr 26 19:18:52 UTC 2020
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 for native futex calls. To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.151 -r1.152 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.31 -r1.32 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.150 -r1.151 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.42 -r1.43 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.152 src/sys/compat/netbsd32/netbsd32_syscall.h:1.153 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.152 Wed Apr 22 21:25:17 2020 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun Apr 26 19:18:52 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.152 2020/04/22 21:25:17 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.153 2020/04/26 19:18:52 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp + * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -462,6 +462,15 @@ /* syscall: "netbsd32_sysarch" ret: "int" args: "int" "netbsd32_voidp" */ #define NETBSD32_SYS_netbsd32_sysarch 165 +/* syscall: "netbsd32___futex" ret: "int" args: "netbsd32_intp" "int" "int" "const netbsd32_timespecp_t" "netbsd32_intp" "int" "int" */ +#define NETBSD32_SYS_netbsd32___futex 166 + +/* syscall: "netbsd32___futex_set_robust_list" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */ +#define NETBSD32_SYS_netbsd32___futex_set_robust_list 167 + +/* syscall: "netbsd32___futex_get_robust_list" ret: "int" args: "lwpid_t" "netbsd32_voidp" "netbsd32_size_tp" */ +#define NETBSD32_SYS_netbsd32___futex_get_robust_list 168 + /* syscall: "compat_10_osemsys" ret: "int" args: "int" "int" "int" "int" "int" */ #define NETBSD32_SYS_compat_10_osemsys 169 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.151 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.152 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.151 Wed Apr 22 21:25:17 2020 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sun Apr 26 19:18:52 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.151 2020/04/22 21:25:17 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.152 2020/04/26 19:18:52 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp + * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -864,6 +864,30 @@ struct netbsd32_sysarch_args { }; check_syscall_args(netbsd32_sysarch) +struct netbsd32___futex_args { + syscallarg(netbsd32_intp) uaddr; + syscallarg(int) op; + syscallarg(int) val; + syscallarg(const netbsd32_timespecp_t) timeout; + syscallarg(netbsd32_intp) uaddr2; + syscallarg(int) val2; + syscallarg(int) val3; +}; +check_syscall_args(netbsd32___futex) + +struct netbsd32___futex_set_robust_list_args { + syscallarg(netbsd32_voidp) head; + syscallarg(netbsd32_size_t) len; +}; +check_syscall_args(netbsd32___futex_set_robust_list) + +struct netbsd32___futex_get_robust_list_args { + syscallarg(lwpid_t) lwpid; + syscallarg(netbsd32_voidp) headp; + syscallarg(netbsd32_size_tp) lenp; +}; +check_syscall_args(netbsd32___futex_get_robust_list) + struct compat_10_netbsd32_semsys_args { syscallarg(int) which; syscallarg(int) a2; @@ -2941,6 +2965,12 @@ int compat_09_netbsd32_uname(struct lwp int netbsd32_sysarch(struct lwp *, const struct netbsd32_sysarch_args *, register_t *); +int netbsd32___futex(struct lwp *, const struct netbsd32___futex_args *, register_t *); + +int netbsd32___futex_set_robust_list(struct lwp *, const struct netbsd32___futex_set_robust_list_args *, register_t *); + +int netbsd32___futex_get_robust_list(struct lwp *, const struct netbsd32___futex_get_robust_list_args *, register_t *); + int compat_10_netbsd32_semsys(struct lwp *, const struct compat_10_netbsd32_semsys_args *, register_t *); int compat_10_netbsd32_msgsys(struct lwp *, const struct compat_10_netbsd32_msgsys_args *, register_t *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.151 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.152 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.151 Wed Apr 22 21:25:18 2020 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sun Apr 26 19:18:52 2020 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.152 2020/04/26 19:18:52 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp + * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.152 2020/04/26 19:18:52 thorpej Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -196,9 +196,9 @@ const char *const netbsd32_syscallnames[ /* 163 */ "compat_09_netbsd32_osetdomainname", /* 164 */ "compat_09_netbsd32_uname", /* 165 */ "netbsd32_sysarch", - /* 166 */ "#166 (unimplemented)", - /* 167 */ "#167 (unimplemented)", - /* 168 */ "#168 (unimplemented)", + /* 166 */ "netbsd32___futex", + /* 167 */ "netbsd32___futex_set_robust_list", + /* 168 */ "netbsd32___futex_get_robust_list", /* 169 */ "compat_10_osemsys", /* 170 */ "compat_10_omsgsys", /* 171 */ "compat_10_oshmsys", @@ -721,9 +721,9 @@ const char *const altnetbsd32_syscallnam /* 163 */ NULL, /* compat_09_netbsd32_osetdomainname */ /* 164 */ NULL, /* compat_09_netbsd32_uname */ /* 165 */ "sysarch", - /* 166 */ NULL, /* unimplemented */ - /* 167 */ NULL, /* unimplemented */ - /* 168 */ NULL, /* unimplemented */ + /* 166 */ "__futex", + /* 167 */ "__futex_set_robust_list", + /* 168 */ "__futex_get_robust_list", /* 169 */ NULL, /* compat_10_osemsys */ /* 170 */ NULL, /* compat_10_omsgsys */ /* 171 */ NULL, /* compat_10_oshmsys */ Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.31 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.32 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.31 Wed Apr 22 21:25:18 2020 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sun Apr 26 19:18:52 2020 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.31 2020/04/22 21:25:18 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.32 2020/04/26 19:18:52 thorpej Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp + * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.31 2020/04/22 21:25:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.32 2020/04/26 19:18:52 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.150 src/sys/compat/netbsd32/netbsd32_sysent.c:1.151 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.150 Wed Apr 22 21:25:18 2020 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun Apr 26 19:18:52 2020 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.150 2020/04/22 21:25:18 thorpej Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.151 2020/04/26 19:18:52 thorpej Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp + * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.150 2020/04/22 21:25:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.151 2020/04/26 19:18:52 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -761,14 +761,17 @@ struct sysent netbsd32_sysent[] = { .sy_call = (sy_call_t *)netbsd32_sysarch }, /* 165 = netbsd32_sysarch */ { - .sy_call = sys_nosys, - }, /* 166 = filler */ - { - .sy_call = sys_nosys, - }, /* 167 = filler */ - { - .sy_call = sys_nosys, - }, /* 168 = filler */ + ns(struct netbsd32___futex_args), + .sy_call = (sy_call_t *)netbsd32___futex + }, /* 166 = netbsd32___futex */ + { + ns(struct netbsd32___futex_set_robust_list_args), + .sy_call = (sy_call_t *)netbsd32___futex_set_robust_list + }, /* 167 = netbsd32___futex_set_robust_list */ + { + ns(struct netbsd32___futex_get_robust_list_args), + .sy_call = (sy_call_t *)netbsd32___futex_get_robust_list + }, /* 168 = netbsd32___futex_get_robust_list */ { ns(struct compat_10_netbsd32_semsys_args), .sy_call = (sy_call_t *)sys_nomodule Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.42 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.43 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.42 Wed Apr 22 21:25:18 2020 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sun Apr 26 19:18:52 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.42 2020/04/22 21:25:18 thorpej Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.43 2020/04/26 19:18:52 thorpej Exp $ */ /* * System call argument to DTrace register array converstion. @@ -1186,6 +1186,36 @@ systrace_args(register_t sysnum, const v *n_args = 2; break; } + /* netbsd32___futex */ + case 166: { + const struct netbsd32___futex_args *p = params; + uarg[0] = (intptr_t) SCARG(p, uaddr).i32; /* netbsd32_intp */ + iarg[1] = SCARG(p, op); /* int */ + iarg[2] = SCARG(p, val); /* int */ + uarg[3] = (intptr_t) SCARG(p, timeout).i32; /* const netbsd32_timespecp_t */ + uarg[4] = (intptr_t) SCARG(p, uaddr2).i32; /* netbsd32_intp */ + iarg[5] = SCARG(p, val2); /* int */ + iarg[6] = SCARG(p, val3); /* int */ + *n_args = 7; + break; + } + /* netbsd32___futex_set_robust_list */ + case 167: { + const struct netbsd32___futex_set_robust_list_args *p = params; + uarg[0] = (intptr_t) SCARG(p, head).i32; /* netbsd32_voidp */ + iarg[1] = SCARG(p, len); /* netbsd32_size_t */ + *n_args = 2; + break; + } + /* netbsd32___futex_get_robust_list */ + case 168: { + const struct netbsd32___futex_get_robust_list_args *p = params; + iarg[0] = SCARG(p, lwpid); /* lwpid_t */ + uarg[1] = (intptr_t) SCARG(p, headp).i32; /* netbsd32_voidp */ + uarg[2] = (intptr_t) SCARG(p, lenp).i32; /* netbsd32_size_tp */ + *n_args = 3; + break; + } /* netbsd32_semsys */ case 169: { const struct compat_10_netbsd32_semsys_args *p = params; @@ -5427,6 +5457,63 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* netbsd32___futex */ + case 166: + switch(ndx) { + case 0: + p = "netbsd32_intp"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + case 3: + p = "const netbsd32_timespecp_t"; + break; + case 4: + p = "netbsd32_intp"; + break; + case 5: + p = "int"; + break; + case 6: + p = "int"; + break; + default: + break; + }; + break; + /* netbsd32___futex_set_robust_list */ + case 167: + switch(ndx) { + case 0: + p = "netbsd32_voidp"; + break; + case 1: + p = "netbsd32_size_t"; + break; + default: + break; + }; + break; + /* netbsd32___futex_get_robust_list */ + case 168: + switch(ndx) { + case 0: + p = "lwpid_t"; + break; + case 1: + p = "netbsd32_voidp"; + break; + case 2: + p = "netbsd32_size_tp"; + break; + default: + break; + }; + break; /* netbsd32_semsys */ case 169: switch(ndx) { @@ -10200,6 +10287,21 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* netbsd32___futex */ + case 166: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* netbsd32___futex_set_robust_list */ + case 167: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* netbsd32___futex_get_robust_list */ + case 168: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* netbsd32_semsys */ case 169: if (ndx == 0 || ndx == 1)