 @@ -1,20 +1,20 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.159 2023/07/30 05:31:30 rin Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.160 2023/07/30 06:53:13 rin Exp $ */
 /*
  * System call numbers.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
+ * created from	NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
  */
 #ifndef _NETBSD32_SYS_SYSCALL_H_
 #define	_NETBSD32_SYS_SYSCALL_H_
 #define	NETBSD32_SYS_MAXSYSARGS	8
 /* syscall: "netbsd32_syscall" ret: "int" args: "int" "..." */
 #define	NETBSD32_SYS_netbsd32_syscall	0
 /* syscall: "netbsd32_exit" ret: "void" args: "int" */
 #define	NETBSD32_SYS_netbsd32_exit	1
 @@ -1334,16 +1334,25 @@
 /* syscall: "netbsd32___acl_aclcheck_fd" ret: "int" args: "int" "acl_type_t" "netbsd32_aclp_t" */
 #define	NETBSD32_SYS_netbsd32___acl_aclcheck_fd	498
 /* syscall: "netbsd32_lpathconf" ret: "long" args: "const netbsd32_charp" "int" */
 #define	NETBSD32_SYS_netbsd32_lpathconf	499
 /* syscall: "netbsd32_memfd_create" ret: "int" args: "const netbsd32_charp" "unsigned int" */
 #define	NETBSD32_SYS_netbsd32_memfd_create	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
 /* syscall: "netbsd32_epoll_create1" ret: "int" args: "int" */
 #define	NETBSD32_SYS_netbsd32_epoll_create1	502
 /* syscall: "netbsd32_epoll_ctl" ret: "int" args: "int" "int" "int" "netbsd32_epoll_eventp_t" */
 #define	NETBSD32_SYS_netbsd32_epoll_ctl	503
 /* syscall: "netbsd32_epoll_pwait2" ret: "int" args: "int" "netbsd32_epoll_eventp_t" "int" "netbsd32_timespecp_t" "netbsd32_sigsetp_t" */
 #define	NETBSD32_SYS_netbsd32_epoll_pwait2	504
 #define	NETBSD32_SYS_MAXSYSCALL	505
 #define	NETBSD32_SYS_NSYSENT	512
 #endif /* _NETBSD32_SYS_SYSCALL_H_ */

 @@ -1,20 +1,20 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.158 2023/07/30 05:31:30 rin Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.159 2023/07/30 06:53:13 rin Exp $ */
 /*
  * System call argument lists.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
+ * created from	NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
  */
 #ifndef _NETBSD32_SYS_SYSCALLARGS_H_
 #define	_NETBSD32_SYS_SYSCALLARGS_H_
 /* Forward declaration */
 struct lwp;
 #define	NETBSD32_SYS_MAXSYSARGS	8
 #undef	syscallarg
 #define	syscallarg(x)							\
 	union {								\
 @@ -2795,26 +2795,48 @@ struct netbsd32_memfd_create_args {
 };
 check_syscall_args(netbsd32_memfd_create)
 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)
 struct netbsd32_epoll_create1_args {
 	syscallarg(int) flags;
 };
 check_syscall_args(netbsd32_epoll_create1)
 struct netbsd32_epoll_ctl_args {
 	syscallarg(int) epfd;
 	syscallarg(int) op;
 	syscallarg(int) fd;
 	syscallarg(netbsd32_epoll_eventp_t) event;
 };
 check_syscall_args(netbsd32_epoll_ctl)
 struct netbsd32_epoll_pwait2_args {
 	syscallarg(int) epfd;
 	syscallarg(netbsd32_epoll_eventp_t) events;
 	syscallarg(int) maxevents;
 	syscallarg(netbsd32_timespecp_t) timeout;
 	syscallarg(netbsd32_sigsetp_t) sigmask;
 };
 check_syscall_args(netbsd32_epoll_pwait2)
 /*
  * System call prototypes.
  */
 int	netbsd32_syscall(struct lwp *, const struct netbsd32_syscall_args *, register_t *);
 int	netbsd32_exit(struct lwp *, const struct netbsd32_exit_args *, register_t *);
 int	sys_fork(struct lwp *, const void *, register_t *);
 int	netbsd32_read(struct lwp *, const struct netbsd32_read_args *, register_t *);
 int	netbsd32_write(struct lwp *, const struct netbsd32_write_args *, register_t *);
 @@ -3669,14 +3691,20 @@ int	netbsd32___acl_delete_file(struct lw
 int	netbsd32___acl_delete_fd(struct lwp *, const struct netbsd32___acl_delete_fd_args *, register_t *);
 int	netbsd32___acl_aclcheck_file(struct lwp *, const struct netbsd32___acl_aclcheck_file_args *, register_t *);
 int	netbsd32___acl_aclcheck_fd(struct lwp *, const struct netbsd32___acl_aclcheck_fd_args *, register_t *);
 int	netbsd32_lpathconf(struct lwp *, const struct netbsd32_lpathconf_args *, register_t *);
 int	netbsd32_memfd_create(struct lwp *, const struct netbsd32_memfd_create_args *, register_t *);
 int	netbsd32___kevent100(struct lwp *, const struct netbsd32___kevent100_args *, register_t *);
 int	netbsd32_epoll_create1(struct lwp *, const struct netbsd32_epoll_create1_args *, register_t *);
 int	netbsd32_epoll_ctl(struct lwp *, const struct netbsd32_epoll_ctl_args *, register_t *);
 int	netbsd32_epoll_pwait2(struct lwp *, const struct netbsd32_epoll_pwait2_args *, register_t *);
 #endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */

 @@ -1,24 +1,24 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.158 2023/07/30 05:31:30 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.159 2023/07/30 06:53:13 rin Exp $ */
 /*
  * System call names.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
+ * created from	NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.158 2023/07/30 05:31:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.159 2023/07/30 06:53:13 rin Exp $");
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #include "opt_ntp.h"
 #include "opt_compat_43.h"
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 @@ -530,29 +530,29 @@ const char *const netbsd32_syscallnames[
 	/* 489 */	"netbsd32___acl_delete_link",
 	/* 490 */	"netbsd32___acl_aclcheck_link",
 	/* 491 */	"netbsd32___acl_get_file",
 	/* 492 */	"netbsd32___acl_set_file",
 	/* 493 */	"netbsd32___acl_get_fd",
 	/* 494 */	"netbsd32___acl_set_fd",
 	/* 495 */	"netbsd32___acl_delete_file",
 	/* 496 */	"netbsd32___acl_delete_fd",
 	/* 497 */	"netbsd32___acl_aclcheck_file",
 	/* 498 */	"netbsd32___acl_aclcheck_fd",
 	/* 499 */	"netbsd32_lpathconf",
 	/* 500 */	"netbsd32_memfd_create",
 	/* 501 */	"netbsd32___kevent100",
-	/* 502 */	"#502 (unimplemented epoll_create1)",
+	/* 502 */	"netbsd32_epoll_create1",
-	/* 503 */	"#503 (unimplemented epoll_ctl)",
+	/* 503 */	"netbsd32_epoll_ctl",
-	/* 504 */	"#504 (unimplemented epoll_pwait2)",
+	/* 504 */	"netbsd32_epoll_pwait2",
 	/* 505 */	"# filler",
 	/* 506 */	"# filler",
 	/* 507 */	"# filler",
 	/* 508 */	"# filler",
 	/* 509 */	"# filler",
 	/* 510 */	"# filler",
 	/* 511 */	"# filler",
 };
 /* libc style syscall names */
 const char *const altnetbsd32_syscallnames[] = {
 	/*   0 */	"syscall",
 @@ -1055,24 +1055,24 @@ const char *const altnetbsd32_syscallnam
 	/* 489 */	"__acl_delete_link",
 	/* 490 */	"__acl_aclcheck_link",
 	/* 491 */	"__acl_get_file",
 	/* 492 */	"__acl_set_file",
 	/* 493 */	"__acl_get_fd",
 	/* 494 */	"__acl_set_fd",
 	/* 495 */	"__acl_delete_file",
 	/* 496 */	"__acl_delete_fd",
 	/* 497 */	"__acl_aclcheck_file",
 	/* 498 */	"__acl_aclcheck_fd",
 	/* 499 */	"lpathconf",
 	/* 500 */	"memfd_create",
 	/* 501 */	"kevent",
-	/* 502 */	NULL, /* unimplemented epoll_create1 */
+	/* 502 */	"epoll_create1",
-	/* 503 */	NULL, /* unimplemented epoll_ctl */
+	/* 503 */	"epoll_ctl",
-	/* 504 */	NULL, /* unimplemented epoll_pwait2 */
+	/* 504 */	"epoll_pwait2",
 	/* 505 */	NULL, /* filler */
 	/* 506 */	NULL, /* filler */
 	/* 507 */	NULL, /* filler */
 	/* 508 */	NULL, /* filler */
 	/* 509 */	NULL, /* filler */
 	/* 510 */	NULL, /* filler */
 	/* 511 */	NULL, /* filler */
 };

 @@ -1,24 +1,24 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.38 2023/07/30 05:31:30 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.39 2023/07/30 06:53:13 rin Exp $ */
 /*
  * System call autoload table.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
+ * created from	NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.38 2023/07/30 05:31:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.39 2023/07/30 06:53:13 rin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #include "opt_ntp.h"
 #include "opt_compat_43.h"
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <compat/netbsd32/netbsd32.h>

 @@ -1,24 +1,24 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.157 2023/07/30 05:31:30 rin Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.158 2023/07/30 06:53:13 rin Exp $ */
 /*
  * System call switch table.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
+ * created from	NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.157 2023/07/30 05:31:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.158 2023/07/30 06:53:13 rin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #include "opt_ntp.h"
 #include "opt_compat_43.h"
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <compat/netbsd32/netbsd32.h>
 @@ -2070,34 +2070,37 @@ struct sysent netbsd32_sysent[] = {
+	{
 		ns(struct netbsd32_lpathconf_args),
 		.sy_call = (sy_call_t *)netbsd32_lpathconf
 	},		/* 499 = netbsd32_lpathconf */
+	{
 		ns(struct netbsd32_memfd_create_args),
 		.sy_call = (sy_call_t *)netbsd32_memfd_create
 	},		/* 500 = netbsd32_memfd_create */
+	{
 		ns(struct netbsd32___kevent100_args),
 		.sy_call = (sy_call_t *)netbsd32___kevent100
 	},		/* 501 = netbsd32___kevent100 */
+	{
-		.sy_call = sys_nosys,
+		ns(struct netbsd32_epoll_create1_args),
-	},		/* 502 = filler */
+		.sy_call = (sy_call_t *)netbsd32_epoll_create1
 	},		/* 502 = netbsd32_epoll_create1 */
 		.sy_call = sys_nosys,
-	},		/* 503 = filler */
+		ns(struct netbsd32_epoll_ctl_args),
 		.sy_call = (sy_call_t *)netbsd32_epoll_ctl
-		.sy_call = sys_nosys,
+	},		/* 503 = netbsd32_epoll_ctl */
 	},		/* 504 = filler */
 		ns(struct netbsd32_epoll_pwait2_args),
 		.sy_call = (sy_call_t *)netbsd32_epoll_pwait2
 	},		/* 504 = netbsd32_epoll_pwait2 */
+	{
 		.sy_call = sys_nosys,
 	},		/* 505 = filler */
+	{
 		.sy_call = sys_nosys,
 	},		/* 506 = filler */
+	{
 		.sy_call = sys_nosys,
 	},		/* 507 = filler */
+	{
 		.sy_call = sys_nosys,
 	},		/* 508 = filler */
+	{

 @@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.51 2023/07/30 05:31:30 rin Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.52 2023/07/30 06:53:13 rin Exp $ */
 /*
  * System call argument to DTrace register array conversion.
+ *
  * DO NOT EDIT-- this file is automatically generated.
  * This file is part of the DTrace syscall provider.
  */
 static void
 systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_args)
+{
 	intptr_t *iarg  = (intptr_t *)uarg;
 	switch (sysnum) {
 @@ -3714,26 +3714,54 @@ systrace_args(register_t sysnum, const v
+	}
 	/* 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;
+	}
 	/* netbsd32_epoll_create1 */
 	case 502: {
 		const struct netbsd32_epoll_create1_args *p = params;
 		iarg[0] = SCARG(p, flags); /* int */
 		*n_args = 1;
 		break;
+	}
 	/* netbsd32_epoll_ctl */
 	case 503: {
 		const struct netbsd32_epoll_ctl_args *p = params;
 		iarg[0] = SCARG(p, epfd); /* int */
 		iarg[1] = SCARG(p, op); /* int */
 		iarg[2] = SCARG(p, fd); /* int */
 		uarg[3] = (intptr_t) SCARG(p, event).i32; /* netbsd32_epoll_eventp_t */
 		*n_args = 4;
 		break;
+	}
 	/* netbsd32_epoll_pwait2 */
 	case 504: {
 		const struct netbsd32_epoll_pwait2_args *p = params;
 		iarg[0] = SCARG(p, epfd); /* int */
 		uarg[1] = (intptr_t) SCARG(p, events).i32; /* netbsd32_epoll_eventp_t */
 		iarg[2] = SCARG(p, maxevents); /* int */
 		uarg[3] = (intptr_t) SCARG(p, timeout).i32; /* netbsd32_timespecp_t */
 		uarg[4] = (intptr_t) SCARG(p, sigmask).i32; /* netbsd32_sigsetp_t */
 		*n_args = 5;
 		break;
+	}
 	default:
 		*n_args = 0;
 		break;
 	};
+}
 static void
 systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
+{
 	const char *p = NULL;
 	switch (sysnum) {
 	/* netbsd32_syscall */
 	case 0:
 		switch(ndx) {
 @@ -10071,26 +10099,77 @@ systrace_entry_setargdesc(int sysnum, in
 		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;
 	/* netbsd32_epoll_create1 */
 	case 502:
 		switch(ndx) {
 		case 0:
 			p = "int";
 			break;
 		default:
 			break;
 		};
 		break;
 	/* netbsd32_epoll_ctl */
 	case 503:
 		switch(ndx) {
 		case 0:
 			p = "int";
 			break;
 		case 1:
 			p = "int";
 			break;
 		case 2:
 			p = "int";
 			break;
 		case 3:
 			p = "netbsd32_epoll_eventp_t";
 			break;
 		default:
 			break;
 		};
 		break;
 	/* netbsd32_epoll_pwait2 */
 	case 504:
 		switch(ndx) {
 		case 0:
 			p = "int";
 			break;
 		case 1:
 			p = "netbsd32_epoll_eventp_t";
 			break;
 		case 2:
 			p = "int";
 			break;
 		case 3:
 			p = "netbsd32_timespecp_t";
 			break;
 		case 4:
 			p = "netbsd32_sigsetp_t";
 			break;
 		default:
 			break;
 		};
 		break;
 	default:
 		break;
 	};
 	if (p != NULL)
 		strlcpy(desc, p, descsz);
+}
 static void
 systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
+{
 	const char *p = NULL;
 	switch (sysnum) {
 	/* netbsd32_syscall */
 	case 0:
 @@ -12173,19 +12252,34 @@ systrace_return_setargdesc(int sysnum, i
 		if (ndx == 0 || ndx == 1)
 			p = "long";
 		break;
 	/* netbsd32_memfd_create */
 	case 500:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
 	/* netbsd32___kevent100 */
 	case 501:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
 	/* netbsd32_epoll_create1 */
 	case 502:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
 	/* netbsd32_epoll_ctl */
 	case 503:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
 	/* netbsd32_epoll_pwait2 */
 	case 504:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
 	default:
 		break;
 	};
 	if (p != NULL)
 		strlcpy(desc, p, descsz);
+}