Module Name: src Committed By: rin Date: Sat Jul 29 12:39:20 UTC 2023
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: COMPAT_NETBSD32: Regen for syscalls.master,v 1.142 To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.156 -r1.157 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.36 -r1.37 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.155 -r1.156 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.49 -r1.50 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.157 src/sys/compat/netbsd32/netbsd32_syscall.h:1.158 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.157 Mon Sep 20 01:07:56 2021 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Jul 29 12:39:20 2023 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.157 2021/09/20 01:07:56 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.158 2023/07/29 12:39:20 rin Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp + * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -917,7 +917,7 @@ /* syscall: "kqueue" ret: "int" args: */ #define NETBSD32_SYS_kqueue 344 -/* syscall: "compat_50_netbsd32_kevent" ret: "int" args: "int" "netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_timespec50p_t" */ +/* syscall: "compat_50_netbsd32_kevent" ret: "int" args: "int" "netbsd32_kevent100p_t" "netbsd32_size_t" "netbsd32_kevent100p_t" "netbsd32_size_t" "netbsd32_timespec50p_t" */ #define NETBSD32_SYS_compat_50_netbsd32_kevent 345 /* syscall: "netbsd32__sched_setparam" ret: "int" args: "pid_t" "lwpid_t" "int" "const netbsd32_sched_paramp_t" */ @@ -1144,8 +1144,8 @@ /* syscall: "compat_60_netbsd32__lwp_park" ret: "int" args: "const netbsd32_timespecp_t" "lwpid_t" "const netbsd32_voidp" "const netbsd32_voidp" */ #define NETBSD32_SYS_compat_60_netbsd32__lwp_park 434 -/* syscall: "netbsd32___kevent50" ret: "int" args: "int" "const netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */ -#define NETBSD32_SYS_netbsd32___kevent50 435 +/* syscall: "compat_100_netbsd32___kevent50" ret: "int" args: "int" "const netbsd32_kevent100p_t" "netbsd32_size_t" "netbsd32_kevent100p_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */ +#define NETBSD32_SYS_compat_100_netbsd32___kevent50 435 /* syscall: "netbsd32___pselect50" ret: "int" args: "int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "const netbsd32_timespecp_t" "const netbsd32_sigsetp_t" */ #define NETBSD32_SYS_netbsd32___pselect50 436 @@ -1338,6 +1338,9 @@ /* syscall: "netbsd32_lpathconf" ret: "long" args: "const netbsd32_charp" "int" */ #define NETBSD32_SYS_netbsd32_lpathconf 499 -#define NETBSD32_SYS_MAXSYSCALL 500 +/* syscall: "netbsd32___kevent100" ret: "int" args: "int" "const netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */ +#define NETBSD32_SYS_netbsd32___kevent100 501 + +#define NETBSD32_SYS_MAXSYSCALL 505 #define NETBSD32_SYS_NSYSENT 512 #endif /* _NETBSD32_SYS_SYSCALL_H_ */ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.156 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.157 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.156 Mon Sep 20 01:07:56 2021 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Jul 29 12:39:20 2023 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.156 2021/09/20 01:07:56 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.157 2023/07/29 12:39:20 rin Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp + * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -1777,9 +1777,9 @@ check_syscall_args(netbsd32_rasctl) struct compat_50_netbsd32_kevent_args { syscallarg(int) fd; - syscallarg(netbsd32_keventp_t) changelist; + syscallarg(netbsd32_kevent100p_t) changelist; syscallarg(netbsd32_size_t) nchanges; - syscallarg(netbsd32_keventp_t) eventlist; + syscallarg(netbsd32_kevent100p_t) eventlist; syscallarg(netbsd32_size_t) nevents; syscallarg(netbsd32_timespec50p_t) timeout; }; @@ -2320,15 +2320,15 @@ struct compat_60_netbsd32__lwp_park_args }; check_syscall_args(compat_60_netbsd32__lwp_park) -struct netbsd32___kevent50_args { +struct compat_100_netbsd32___kevent50_args { syscallarg(int) fd; - syscallarg(const netbsd32_keventp_t) changelist; + syscallarg(const netbsd32_kevent100p_t) changelist; syscallarg(netbsd32_size_t) nchanges; - syscallarg(netbsd32_keventp_t) eventlist; + syscallarg(netbsd32_kevent100p_t) eventlist; syscallarg(netbsd32_size_t) nevents; syscallarg(const netbsd32_timespecp_t) timeout; }; -check_syscall_args(netbsd32___kevent50) +check_syscall_args(compat_100_netbsd32___kevent50) struct netbsd32___pselect50_args { syscallarg(int) nd; @@ -2789,6 +2789,16 @@ struct netbsd32_lpathconf_args { }; check_syscall_args(netbsd32_lpathconf) +struct netbsd32___kevent100_args { + syscallarg(int) fd; + syscallarg(const netbsd32_keventp_t) changelist; + syscallarg(netbsd32_size_t) nchanges; + syscallarg(netbsd32_keventp_t) eventlist; + syscallarg(netbsd32_size_t) nevents; + syscallarg(const netbsd32_timespecp_t) timeout; +}; +check_syscall_args(netbsd32___kevent100) + /* * System call prototypes. */ @@ -3530,7 +3540,7 @@ int netbsd32___mq_timedreceive50(struct int compat_60_netbsd32__lwp_park(struct lwp *, const struct compat_60_netbsd32__lwp_park_args *, register_t *); -int netbsd32___kevent50(struct lwp *, const struct netbsd32___kevent50_args *, register_t *); +int compat_100_netbsd32___kevent50(struct lwp *, const struct compat_100_netbsd32___kevent50_args *, register_t *); int netbsd32___pselect50(struct lwp *, const struct netbsd32___pselect50_args *, register_t *); @@ -3659,4 +3669,6 @@ int netbsd32___acl_aclcheck_fd(struct lw int netbsd32_lpathconf(struct lwp *, const struct netbsd32_lpathconf_args *, register_t *); +int netbsd32___kevent100(struct lwp *, const struct netbsd32___kevent100_args *, register_t *); + #endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.156 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.157 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.156 Mon Sep 20 01:07:56 2021 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Jul 29 12:39:20 2023 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.156 2021/09/20 01:07:56 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.157 2023/07/29 12:39:20 rin Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp + * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.156 2021/09/20 01:07:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.157 2023/07/29 12:39:20 rin Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -469,7 +469,7 @@ const char *const netbsd32_syscallnames[ /* 432 */ "netbsd32___mq_timedsend50", /* 433 */ "netbsd32___mq_timedreceive50", /* 434 */ "compat_60_netbsd32__lwp_park", - /* 435 */ "netbsd32___kevent50", + /* 435 */ "compat_100_netbsd32___kevent50", /* 436 */ "netbsd32___pselect50", /* 437 */ "netbsd32___pollts50", /* 438 */ "#438 (unimplemented netbsd32___aio_suspend50)", @@ -538,11 +538,11 @@ const char *const netbsd32_syscallnames[ /* 497 */ "netbsd32___acl_aclcheck_file", /* 498 */ "netbsd32___acl_aclcheck_fd", /* 499 */ "netbsd32_lpathconf", - /* 500 */ "# filler", - /* 501 */ "# filler", - /* 502 */ "# filler", - /* 503 */ "# filler", - /* 504 */ "# filler", + /* 500 */ "#500 (unimplemented memfd_create)", + /* 501 */ "netbsd32___kevent100", + /* 502 */ "#502 (unimplemented epoll_create1)", + /* 503 */ "#503 (unimplemented epoll_ctl)", + /* 504 */ "#504 (unimplemented epoll_pwait2)", /* 505 */ "# filler", /* 506 */ "# filler", /* 507 */ "# filler", @@ -994,7 +994,7 @@ const char *const altnetbsd32_syscallnam /* 432 */ "mq_timedsend", /* 433 */ "mq_timedreceive", /* 434 */ NULL, /* compat_60_netbsd32__lwp_park */ - /* 435 */ "kevent", + /* 435 */ NULL, /* compat_100_netbsd32___kevent50 */ /* 436 */ "pselect", /* 437 */ "pollts", /* 438 */ NULL, /* unimplemented netbsd32___aio_suspend50 */ @@ -1063,11 +1063,11 @@ const char *const altnetbsd32_syscallnam /* 497 */ "__acl_aclcheck_file", /* 498 */ "__acl_aclcheck_fd", /* 499 */ "lpathconf", - /* 500 */ NULL, /* filler */ - /* 501 */ NULL, /* filler */ - /* 502 */ NULL, /* filler */ - /* 503 */ NULL, /* filler */ - /* 504 */ NULL, /* filler */ + /* 500 */ NULL, /* unimplemented memfd_create */ + /* 501 */ "kevent", + /* 502 */ NULL, /* unimplemented epoll_create1 */ + /* 503 */ NULL, /* unimplemented epoll_ctl */ + /* 504 */ NULL, /* unimplemented epoll_pwait2 */ /* 505 */ NULL, /* filler */ /* 506 */ NULL, /* filler */ /* 507 */ NULL, /* filler */ Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.36 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.37 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.36 Mon Sep 20 01:07:56 2021 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sat Jul 29 12:39:20 2023 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.36 2021/09/20 01:07:56 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.37 2023/07/29 12:39:20 rin Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp + * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.36 2021/09/20 01:07:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.37 2023/07/29 12:39:20 rin Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -158,6 +158,7 @@ static struct sc_autoload netbsd32_sysca { NETBSD32_SYS_netbsd32___mq_timedsend50, "compat_netbsd32_mqueue" }, { NETBSD32_SYS_netbsd32___mq_timedreceive50, "compat_netbsd32_mqueue" }, { NETBSD32_SYS_compat_60_netbsd32__lwp_park, "compat_netbsd32_60" }, + { NETBSD32_SYS_compat_100_netbsd32___kevent50, "compat_netbsd32_100" }, { NETBSD32_SYS_netbsd32_____semctl50, "compat_netbsd32_sysvipc" }, { NETBSD32_SYS_netbsd32___shmctl50, "compat_netbsd32_sysvipc" }, { NETBSD32_SYS_netbsd32___msgctl50, "compat_netbsd32_sysvipc" }, Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.155 src/sys/compat/netbsd32/netbsd32_sysent.c:1.156 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.155 Mon Sep 20 01:07:56 2021 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Sat Jul 29 12:39:20 2023 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.155 2021/09/20 01:07:56 thorpej Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.156 2023/07/29 12:39:20 rin Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp + * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.155 2021/09/20 01:07:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.156 2023/07/29 12:39:20 rin Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -127,6 +127,12 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys #define compat_90(func) sys_nosys #endif +#ifdef COMPAT_100 +#define compat_100(func) __CONCAT(compat_100_,func) +#else +#define compat_100(func) sys_nosys +#endif + #define s(type) sizeof(type) #define n(type) (sizeof(type)/sizeof (register32_t)) #define ns(type) .sy_narg = n(type), .sy_argsize = s(type) @@ -1798,9 +1804,9 @@ struct sysent netbsd32_sysent[] = { .sy_call = (sy_call_t *)sys_nomodule }, /* 434 = compat_60_netbsd32__lwp_park */ { - ns(struct netbsd32___kevent50_args), - .sy_call = (sy_call_t *)netbsd32___kevent50 - }, /* 435 = netbsd32___kevent50 */ + ns(struct compat_100_netbsd32___kevent50_args), + .sy_call = (sy_call_t *)sys_nomodule + }, /* 435 = compat_100_netbsd32___kevent50 */ { ns(struct netbsd32___pselect50_args), .sy_call = (sy_call_t *)netbsd32___pselect50 @@ -2069,8 +2075,9 @@ struct sysent netbsd32_sysent[] = { .sy_call = sys_nosys, }, /* 500 = filler */ { - .sy_call = sys_nosys, - }, /* 501 = filler */ + ns(struct netbsd32___kevent100_args), + .sy_call = (sy_call_t *)netbsd32___kevent100 + }, /* 501 = netbsd32___kevent100 */ { .sy_call = sys_nosys, }, /* 502 = filler */ @@ -2117,7 +2124,7 @@ const uint32_t netbsd32_sysent_nomodbits 0x02000001, /* syscalls 320-351 */ 0x006000f0, /* syscalls 352-383 */ 0x00006338, /* syscalls 384-415 */ - 0x1c070000, /* syscalls 416-447 */ + 0x1c0f0000, /* syscalls 416-447 */ 0x02000000, /* syscalls 448-479 */ 0x00000000, /* syscalls 480-511 */ }; Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.49 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.50 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.49 Mon Sep 20 01:07:56 2021 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sat Jul 29 12:39:20 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.49 2021/09/20 01:07:56 thorpej Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.50 2023/07/29 12:39:20 rin Exp $ */ /* * System call argument to DTrace register array conversion. @@ -2415,9 +2415,9 @@ systrace_args(register_t sysnum, const v case 345: { const struct compat_50_netbsd32_kevent_args *p = params; iarg[0] = SCARG(p, fd); /* int */ - uarg[1] = (intptr_t) SCARG(p, changelist).i32; /* netbsd32_keventp_t */ + uarg[1] = (intptr_t) SCARG(p, changelist).i32; /* netbsd32_kevent100p_t */ iarg[2] = SCARG(p, nchanges); /* netbsd32_size_t */ - uarg[3] = (intptr_t) SCARG(p, eventlist).i32; /* netbsd32_keventp_t */ + uarg[3] = (intptr_t) SCARG(p, eventlist).i32; /* netbsd32_kevent100p_t */ iarg[4] = SCARG(p, nevents); /* netbsd32_size_t */ uarg[5] = (intptr_t) SCARG(p, timeout).i32; /* netbsd32_timespec50p_t */ *n_args = 6; @@ -3111,11 +3111,11 @@ systrace_args(register_t sysnum, const v } /* netbsd32___kevent50 */ case 435: { - const struct netbsd32___kevent50_args *p = params; + const struct compat_100_netbsd32___kevent50_args *p = params; iarg[0] = SCARG(p, fd); /* int */ - uarg[1] = (intptr_t) SCARG(p, changelist).i32; /* const netbsd32_keventp_t */ + uarg[1] = (intptr_t) SCARG(p, changelist).i32; /* const netbsd32_kevent100p_t */ iarg[2] = SCARG(p, nchanges); /* netbsd32_size_t */ - uarg[3] = (intptr_t) SCARG(p, eventlist).i32; /* netbsd32_keventp_t */ + uarg[3] = (intptr_t) SCARG(p, eventlist).i32; /* netbsd32_kevent100p_t */ iarg[4] = SCARG(p, nevents); /* netbsd32_size_t */ uarg[5] = (intptr_t) SCARG(p, timeout).i32; /* const netbsd32_timespecp_t */ *n_args = 6; @@ -3704,6 +3704,18 @@ systrace_args(register_t sysnum, const v *n_args = 2; break; } + /* netbsd32___kevent100 */ + case 501: { + const struct netbsd32___kevent100_args *p = params; + iarg[0] = SCARG(p, fd); /* int */ + uarg[1] = (intptr_t) SCARG(p, changelist).i32; /* const netbsd32_keventp_t */ + iarg[2] = SCARG(p, nchanges); /* netbsd32_size_t */ + uarg[3] = (intptr_t) SCARG(p, eventlist).i32; /* netbsd32_keventp_t */ + iarg[4] = SCARG(p, nevents); /* netbsd32_size_t */ + uarg[5] = (intptr_t) SCARG(p, timeout).i32; /* const netbsd32_timespecp_t */ + *n_args = 6; + break; + } default: *n_args = 0; break; @@ -7676,13 +7688,13 @@ systrace_entry_setargdesc(int sysnum, in p = "int"; break; case 1: - p = "netbsd32_keventp_t"; + p = "netbsd32_kevent100p_t"; break; case 2: p = "netbsd32_size_t"; break; case 3: - p = "netbsd32_keventp_t"; + p = "netbsd32_kevent100p_t"; break; case 4: p = "netbsd32_size_t"; @@ -8944,13 +8956,13 @@ systrace_entry_setargdesc(int sysnum, in p = "int"; break; case 1: - p = "const netbsd32_keventp_t"; + p = "const netbsd32_kevent100p_t"; break; case 2: p = "netbsd32_size_t"; break; case 3: - p = "netbsd32_keventp_t"; + p = "netbsd32_kevent100p_t"; break; case 4: p = "netbsd32_size_t"; @@ -10023,6 +10035,31 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* netbsd32___kevent100 */ + case 501: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "const netbsd32_keventp_t"; + break; + case 2: + p = "netbsd32_size_t"; + break; + case 3: + p = "netbsd32_keventp_t"; + break; + case 4: + p = "netbsd32_size_t"; + break; + case 5: + p = "const netbsd32_timespecp_t"; + break; + default: + break; + }; + break; default: break; }; @@ -12115,6 +12152,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "long"; break; + /* netbsd32___kevent100 */ + case 501: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; };