Module Name: src
Committed By: rin
Date: Sun Jul 30 06:53:13 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.144
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.158 -r1.159 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.38 -r1.39 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.157 -r1.158 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.51 -r1.52 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.159 src/sys/compat/netbsd32/netbsd32_syscall.h:1.160
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.159 Sun Jul 30 05:31:30 2023
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun Jul 30 06:53:13 2023
@@ -1,10 +1,10 @@
-/* $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_
@@ -1344,6 +1344,15 @@
/* 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_ */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.158 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.159
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.158 Sun Jul 30 05:31:30 2023
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sun Jul 30 06:53:13 2023
@@ -1,10 +1,10 @@
-/* $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_
@@ -2805,6 +2805,28 @@ struct netbsd32___kevent100_args {
};
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.
*/
@@ -3679,4 +3701,10 @@ int netbsd32_memfd_create(struct lwp *,
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_ */
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.158 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.159
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.158 Sun Jul 30 05:31:30 2023
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sun Jul 30 06:53:13 2023
@@ -1,14 +1,14 @@
-/* $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)
@@ -540,9 +540,9 @@ const char *const netbsd32_syscallnames[
/* 499 */ "netbsd32_lpathconf",
/* 500 */ "netbsd32_memfd_create",
/* 501 */ "netbsd32___kevent100",
- /* 502 */ "#502 (unimplemented epoll_create1)",
- /* 503 */ "#503 (unimplemented epoll_ctl)",
- /* 504 */ "#504 (unimplemented epoll_pwait2)",
+ /* 502 */ "netbsd32_epoll_create1",
+ /* 503 */ "netbsd32_epoll_ctl",
+ /* 504 */ "netbsd32_epoll_pwait2",
/* 505 */ "# filler",
/* 506 */ "# filler",
/* 507 */ "# filler",
@@ -1065,9 +1065,9 @@ const char *const altnetbsd32_syscallnam
/* 499 */ "lpathconf",
/* 500 */ "memfd_create",
/* 501 */ "kevent",
- /* 502 */ NULL, /* unimplemented epoll_create1 */
- /* 503 */ NULL, /* unimplemented epoll_ctl */
- /* 504 */ NULL, /* unimplemented epoll_pwait2 */
+ /* 502 */ "epoll_create1",
+ /* 503 */ "epoll_ctl",
+ /* 504 */ "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.38 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.39
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.38 Sun Jul 30 05:31:30 2023
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sun Jul 30 06:53:13 2023
@@ -1,14 +1,14 @@
-/* $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"
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.157 src/sys/compat/netbsd32/netbsd32_sysent.c:1.158
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.157 Sun Jul 30 05:31:30 2023
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun Jul 30 06:53:13 2023
@@ -1,14 +1,14 @@
-/* $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"
@@ -2080,14 +2080,17 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32___kevent100
}, /* 501 = netbsd32___kevent100 */
{
- .sy_call = sys_nosys,
- }, /* 502 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 503 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 504 = filler */
+ ns(struct netbsd32_epoll_create1_args),
+ .sy_call = (sy_call_t *)netbsd32_epoll_create1
+ }, /* 502 = netbsd32_epoll_create1 */
+ {
+ ns(struct netbsd32_epoll_ctl_args),
+ .sy_call = (sy_call_t *)netbsd32_epoll_ctl
+ }, /* 503 = netbsd32_epoll_ctl */
+ {
+ ns(struct netbsd32_epoll_pwait2_args),
+ .sy_call = (sy_call_t *)netbsd32_epoll_pwait2
+ }, /* 504 = netbsd32_epoll_pwait2 */
{
.sy_call = sys_nosys,
}, /* 505 = filler */
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.51 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.52
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.51 Sun Jul 30 05:31:30 2023
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sun Jul 30 06:53:13 2023
@@ -1,4 +1,4 @@
-/* $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.
@@ -3724,6 +3724,34 @@ systrace_args(register_t sysnum, const v
*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;
@@ -10081,6 +10109,57 @@ systrace_entry_setargdesc(int sysnum, in
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;
};
@@ -12183,6 +12262,21 @@ systrace_return_setargdesc(int sysnum, i
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;
};
