Module Name: src
Committed By: thorpej
Date: Mon Sep 20 01:01:05 UTC 2021
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 timerfd.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.154 -r1.155 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.34 -r1.35 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.153 -r1.154 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.47 -r1.48 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.155 src/sys/compat/netbsd32/netbsd32_syscall.h:1.156
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.155 Sat Oct 10 00:03:52 2020
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Sep 20 01:01:04 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.155 2020/10/10 00:03:52 rin Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.156 2021/09/20 01:01:04 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
+ * created from NetBSD: syscalls.master,v 1.140 2021/09/20 01:00:55 thorpej Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -499,6 +499,15 @@
#else
/* 176 is excluded ntp_adjtime */
#endif
+/* syscall: "netbsd32_timerfd_create" ret: "int" args: "netbsd32_clockid_t" "int" */
+#define NETBSD32_SYS_netbsd32_timerfd_create 177
+
+/* syscall: "netbsd32_timerfd_settime" ret: "int" args: "int" "int" "const netbsd32_itimerspecp_t" "netbsd32_itimerspecp_t" */
+#define NETBSD32_SYS_netbsd32_timerfd_settime 178
+
+/* syscall: "netbsd32_timerfd_gettime" ret: "int" args: "int" "netbsd32_itimerspecp_t" */
+#define NETBSD32_SYS_netbsd32_timerfd_gettime 179
+
/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
#define NETBSD32_SYS_netbsd32_setgid 181
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.154 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.155
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.154 Sat Oct 10 00:03:52 2020
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Sep 20 01:01:04 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.154 2020/10/10 00:03:52 rin Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.155 2021/09/20 01:01:04 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
+ * created from NetBSD: syscalls.master,v 1.140 2021/09/20 01:00:55 thorpej Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -953,6 +953,26 @@ check_syscall_args(netbsd32_ntp_adjtime)
#else
#endif
+struct netbsd32_timerfd_create_args {
+ syscallarg(netbsd32_clockid_t) clock_id;
+ syscallarg(int) flags;
+};
+check_syscall_args(netbsd32_timerfd_create)
+
+struct netbsd32_timerfd_settime_args {
+ syscallarg(int) fd;
+ syscallarg(int) flags;
+ syscallarg(const netbsd32_itimerspecp_t) new_value;
+ syscallarg(netbsd32_itimerspecp_t) old_value;
+};
+check_syscall_args(netbsd32_timerfd_settime)
+
+struct netbsd32_timerfd_gettime_args {
+ syscallarg(int) fd;
+ syscallarg(netbsd32_itimerspecp_t) curr_value;
+};
+check_syscall_args(netbsd32_timerfd_gettime)
+
struct netbsd32_setgid_args {
syscallarg(gid_t) gid;
};
@@ -3084,6 +3104,12 @@ int netbsd32_ntp_adjtime(struct lwp *, c
#else
#endif
+int netbsd32_timerfd_create(struct lwp *, const struct netbsd32_timerfd_create_args *, register_t *);
+
+int netbsd32_timerfd_settime(struct lwp *, const struct netbsd32_timerfd_settime_args *, register_t *);
+
+int netbsd32_timerfd_gettime(struct lwp *, const struct netbsd32_timerfd_gettime_args *, register_t *);
+
int netbsd32_setgid(struct lwp *, const struct netbsd32_setgid_args *, register_t *);
int netbsd32_setegid(struct lwp *, const struct netbsd32_setegid_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.154 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.155
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.154 Sat Oct 10 00:03:53 2020
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Sep 20 01:01:04 2021
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.154 2020/10/10 00:03:53 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.155 2021/09/20 01:01:04 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
+ * created from NetBSD: syscalls.master,v 1.140 2021/09/20 01:00:55 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.154 2020/10/10 00:03:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.155 2021/09/20 01:01:04 thorpej Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -211,9 +211,9 @@ const char *const netbsd32_syscallnames[
#else
/* 176 */ "#176 (excluded ntp_adjtime)",
#endif
- /* 177 */ "#177 (unimplemented)",
- /* 178 */ "#178 (unimplemented)",
- /* 179 */ "#179 (unimplemented)",
+ /* 177 */ "netbsd32_timerfd_create",
+ /* 178 */ "netbsd32_timerfd_settime",
+ /* 179 */ "netbsd32_timerfd_gettime",
/* 180 */ "#180 (unimplemented)",
/* 181 */ "netbsd32_setgid",
/* 182 */ "netbsd32_setegid",
@@ -736,9 +736,9 @@ const char *const altnetbsd32_syscallnam
#else
/* 176 */ NULL, /* excluded ntp_adjtime */
#endif
- /* 177 */ NULL, /* unimplemented */
- /* 178 */ NULL, /* unimplemented */
- /* 179 */ NULL, /* unimplemented */
+ /* 177 */ "timerfd_create",
+ /* 178 */ "timerfd_settime",
+ /* 179 */ "timerfd_gettime",
/* 180 */ NULL, /* unimplemented */
/* 181 */ "setgid",
/* 182 */ "setegid",
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.34 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.35
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.34 Sat Oct 10 00:03:53 2020
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Mon Sep 20 01:01:04 2021
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.34 2020/10/10 00:03:53 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.35 2021/09/20 01:01:04 thorpej Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
+ * created from NetBSD: syscalls.master,v 1.140 2021/09/20 01:00:55 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.34 2020/10/10 00:03:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.35 2021/09/20 01:01:04 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.153 src/sys/compat/netbsd32/netbsd32_sysent.c:1.154
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.153 Sat Oct 10 00:03:53 2020
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Mon Sep 20 01:01:04 2021
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.153 2020/10/10 00:03:53 rin Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.154 2021/09/20 01:01:04 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
+ * created from NetBSD: syscalls.master,v 1.140 2021/09/20 01:00:55 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.153 2020/10/10 00:03:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.154 2021/09/20 01:01:04 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -813,14 +813,17 @@ struct sysent netbsd32_sysent[] = {
}, /* 176 = filler */
#endif
{
- .sy_call = sys_nosys,
- }, /* 177 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 178 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 179 = filler */
+ ns(struct netbsd32_timerfd_create_args),
+ .sy_call = (sy_call_t *)netbsd32_timerfd_create
+ }, /* 177 = netbsd32_timerfd_create */
+ {
+ ns(struct netbsd32_timerfd_settime_args),
+ .sy_call = (sy_call_t *)netbsd32_timerfd_settime
+ }, /* 178 = netbsd32_timerfd_settime */
+ {
+ ns(struct netbsd32_timerfd_gettime_args),
+ .sy_call = (sy_call_t *)netbsd32_timerfd_gettime
+ }, /* 179 = netbsd32_timerfd_gettime */
{
.sy_call = sys_nosys,
}, /* 180 = filler */
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.47 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.48
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.47 Wed Apr 14 02:48:00 2021
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Mon Sep 20 01:01:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.47 2021/04/14 02:48:00 christos Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.48 2021/09/20 01:01:05 thorpej Exp $ */
/*
* System call argument to DTrace register array conversion.
@@ -1297,6 +1297,32 @@ systrace_args(register_t sysnum, const v
}
#else
#endif
+ /* netbsd32_timerfd_create */
+ case 177: {
+ const struct netbsd32_timerfd_create_args *p = params;
+ iarg[0] = SCARG(p, clock_id); /* netbsd32_clockid_t */
+ iarg[1] = SCARG(p, flags); /* int */
+ *n_args = 2;
+ break;
+ }
+ /* netbsd32_timerfd_settime */
+ case 178: {
+ const struct netbsd32_timerfd_settime_args *p = params;
+ iarg[0] = SCARG(p, fd); /* int */
+ iarg[1] = SCARG(p, flags); /* int */
+ uarg[2] = (intptr_t) SCARG(p, new_value).i32; /* const netbsd32_itimerspecp_t */
+ uarg[3] = (intptr_t) SCARG(p, old_value).i32; /* netbsd32_itimerspecp_t */
+ *n_args = 4;
+ break;
+ }
+ /* netbsd32_timerfd_gettime */
+ case 179: {
+ const struct netbsd32_timerfd_gettime_args *p = params;
+ iarg[0] = SCARG(p, fd); /* int */
+ uarg[1] = (intptr_t) SCARG(p, curr_value).i32; /* netbsd32_itimerspecp_t */
+ *n_args = 2;
+ break;
+ }
/* netbsd32_setgid */
case 181: {
const struct netbsd32_setgid_args *p = params;
@@ -5785,6 +5811,51 @@ systrace_entry_setargdesc(int sysnum, in
break;
#else
#endif
+ /* netbsd32_timerfd_create */
+ case 177:
+ switch(ndx) {
+ case 0:
+ p = "netbsd32_clockid_t";
+ break;
+ case 1:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* netbsd32_timerfd_settime */
+ case 178:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "const netbsd32_itimerspecp_t";
+ break;
+ case 3:
+ p = "netbsd32_itimerspecp_t";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* netbsd32_timerfd_gettime */
+ case 179:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "netbsd32_itimerspecp_t";
+ break;
+ default:
+ break;
+ };
+ break;
/* netbsd32_setgid */
case 181:
switch(ndx) {
@@ -10679,6 +10750,21 @@ systrace_return_setargdesc(int sysnum, i
break;
#else
#endif
+ /* netbsd32_timerfd_create */
+ case 177:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* netbsd32_timerfd_settime */
+ case 178:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* netbsd32_timerfd_gettime */
+ case 179:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* netbsd32_setgid */
case 181:
if (ndx == 0 || ndx == 1)
