Module Name: src
Committed By: christos
Date: Sun May 19 22:27:16 UTC 2024
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
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c rumpkern_syscalls.c
src/sys/rump/librump/rumpnet: rumpnet_syscalls.c
src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.159 -r1.160 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.39 -r1.40 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.52 -r1.53 src/sys/compat/netbsd32/netbsd32_systrace_args.c
cvs rdiff -u -r1.341 -r1.342 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.329 -r1.330 src/sys/kern/syscalls.c
cvs rdiff -u -r1.45 -r1.46 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.51 -r1.52 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.128 -r1.129 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.159 -r1.160 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
cvs rdiff -u -r1.324 -r1.325 src/sys/sys/syscall.h
cvs rdiff -u -r1.307 -r1.308 src/sys/sys/syscallargs.h
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.160 src/sys/compat/netbsd32/netbsd32_syscall.h:1.161
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.160 Sun Jul 30 02:53:13 2023
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun May 19 18:27:15 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.160 2023/07/30 06:53:13 rin Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.161 2024/05/19 22:27:15 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
+ * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1200,8 +1200,8 @@
/* syscall: "netbsd32_pipe2" ret: "int" args: "netbsd32_intp" "int" */
#define NETBSD32_SYS_netbsd32_pipe2 453
-/* syscall: "netbsd32_dup3" ret: "int" args: "int" "int" "int" */
-#define NETBSD32_SYS_netbsd32_dup3 454
+/* syscall: "compat_110_netbsd32_dup3" ret: "int" args: "int" "int" "int" */
+#define NETBSD32_SYS_compat_110_netbsd32_dup3 454
/* syscall: "netbsd32_kqueue1" ret: "int" args: "int" */
#define NETBSD32_SYS_netbsd32_kqueue1 455
@@ -1353,6 +1353,9 @@
/* 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
+/* syscall: "netbsd32___dup3110" ret: "int" args: "int" "int" "int" */
+#define NETBSD32_SYS_netbsd32___dup3110 505
+
+#define NETBSD32_SYS_MAXSYSCALL 506
#define NETBSD32_SYS_NSYSENT 512
#endif /* _NETBSD32_SYS_SYSCALL_H_ */
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.160 src/sys/compat/netbsd32/netbsd32_sysent.c:1.161
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.160 Wed May 1 03:22:43 2024
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun May 19 18:27:15 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.160 2024/05/01 07:22:43 mlelstv Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
+ * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.160 2024/05/01 07:22:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -133,6 +133,12 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#define compat_100(func) sys_nosys
#endif
+#ifdef COMPAT_110
+#define compat_110(func) __CONCAT(compat_110_,func)
+#else
+#define compat_110(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)
@@ -1885,9 +1891,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_pipe2
}, /* 453 = netbsd32_pipe2 */
{
- ns(struct netbsd32_dup3_args),
- .sy_call = (sy_call_t *)netbsd32_dup3
- }, /* 454 = netbsd32_dup3 */
+ ns(struct compat_110_netbsd32_dup3_args),
+ .sy_call = (sy_call_t *)sys_nomodule
+ }, /* 454 = compat_110_netbsd32_dup3 */
{
ns(struct netbsd32_kqueue1_args),
.sy_call = (sy_call_t *)netbsd32_kqueue1
@@ -2092,8 +2098,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_epoll_pwait2
}, /* 504 = netbsd32_epoll_pwait2 */
{
- .sy_call = sys_nosys,
- }, /* 505 = filler */
+ ns(struct netbsd32___dup3110_args),
+ .sy_call = (sy_call_t *)netbsd32___dup3110
+ }, /* 505 = netbsd32___dup3110 */
{
.sy_call = sys_nosys,
}, /* 506 = filler */
@@ -2129,6 +2136,6 @@ const uint32_t netbsd32_sysent_nomodbits
0x006000f0, /* syscalls 352-383 */
0x00006338, /* syscalls 384-415 */
0x1c0f0000, /* syscalls 416-447 */
- 0x02000000, /* syscalls 448-479 */
+ 0x02000040, /* syscalls 448-479 */
0x00000000, /* syscalls 480-511 */
};
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.159 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.160
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.159 Sun Jul 30 02:53:13 2023
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sun May 19 18:27:15 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.159 2023/07/30 06:53:13 rin Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.160 2024/05/19 22:27:15 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
+ * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2444,12 +2444,12 @@ struct netbsd32_pipe2_args {
};
check_syscall_args(netbsd32_pipe2)
-struct netbsd32_dup3_args {
+struct compat_110_netbsd32_dup3_args {
syscallarg(int) from;
syscallarg(int) to;
syscallarg(int) flags;
};
-check_syscall_args(netbsd32_dup3)
+check_syscall_args(compat_110_netbsd32_dup3)
struct netbsd32_kqueue1_args {
syscallarg(int) flags;
@@ -2827,6 +2827,13 @@ struct netbsd32_epoll_pwait2_args {
};
check_syscall_args(netbsd32_epoll_pwait2)
+struct netbsd32___dup3110_args {
+ syscallarg(int) from;
+ syscallarg(int) to;
+ syscallarg(int) flags;
+};
+check_syscall_args(netbsd32___dup3110)
+
/*
* System call prototypes.
*/
@@ -3605,7 +3612,7 @@ int netbsd32___fhstat50(struct lwp *, co
int netbsd32_pipe2(struct lwp *, const struct netbsd32_pipe2_args *, register_t *);
-int netbsd32_dup3(struct lwp *, const struct netbsd32_dup3_args *, register_t *);
+int compat_110_netbsd32_dup3(struct lwp *, const struct compat_110_netbsd32_dup3_args *, register_t *);
int netbsd32_kqueue1(struct lwp *, const struct netbsd32_kqueue1_args *, register_t *);
@@ -3707,4 +3714,6 @@ int netbsd32_epoll_ctl(struct lwp *, con
int netbsd32_epoll_pwait2(struct lwp *, const struct netbsd32_epoll_pwait2_args *, register_t *);
+int netbsd32___dup3110(struct lwp *, const struct netbsd32___dup3110_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.159 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.160
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.159 Sun Jul 30 02:53:13 2023
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sun May 19 18:27:15 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.159 2023/07/30 06:53:13 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.160 2024/05/19 22:27:15 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
+ * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.159 2023/07/30 06:53:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.160 2024/05/19 22:27:15 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -492,7 +492,7 @@ const char *const netbsd32_syscallnames[
/* 451 */ "netbsd32___fhstat50",
/* 452 */ "#452 (obsolete 5.99 quotactl)",
/* 453 */ "netbsd32_pipe2",
- /* 454 */ "netbsd32_dup3",
+ /* 454 */ "compat_110_netbsd32_dup3",
/* 455 */ "netbsd32_kqueue1",
/* 456 */ "netbsd32_paccept",
/* 457 */ "netbsd32_linkat",
@@ -543,7 +543,7 @@ const char *const netbsd32_syscallnames[
/* 502 */ "netbsd32_epoll_create1",
/* 503 */ "netbsd32_epoll_ctl",
/* 504 */ "netbsd32_epoll_pwait2",
- /* 505 */ "# filler",
+ /* 505 */ "netbsd32___dup3110",
/* 506 */ "# filler",
/* 507 */ "# filler",
/* 508 */ "# filler",
@@ -1017,7 +1017,7 @@ const char *const altnetbsd32_syscallnam
/* 451 */ "fhstat",
/* 452 */ NULL, /* obsolete 5.99 quotactl */
/* 453 */ "pipe2",
- /* 454 */ "dup3",
+ /* 454 */ NULL, /* compat_110_netbsd32_dup3 */
/* 455 */ "kqueue1",
/* 456 */ "paccept",
/* 457 */ "linkat",
@@ -1068,7 +1068,7 @@ const char *const altnetbsd32_syscallnam
/* 502 */ "epoll_create1",
/* 503 */ "epoll_ctl",
/* 504 */ "epoll_pwait2",
- /* 505 */ NULL, /* filler */
+ /* 505 */ "dup3",
/* 506 */ NULL, /* filler */
/* 507 */ NULL, /* filler */
/* 508 */ NULL, /* filler */
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.39 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.40
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.39 Sun Jul 30 02:53:13 2023
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sun May 19 18:27:15 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.39 2023/07/30 06:53:13 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.40 2024/05/19 22:27:15 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp
+ * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.39 2023/07/30 06:53:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.40 2024/05/19 22:27:15 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -165,6 +165,7 @@ static struct sc_autoload netbsd32_sysca
#if defined(NTP) || !defined(_KERNEL_OPT)
#else
#endif
+ { NETBSD32_SYS_compat_110_netbsd32_dup3, "compat_netbsd32_110" },
{ NETBSD32_SYS_netbsd32___quotactl, "compat_netbsd32_quota" },
{ 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.52 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.53
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.52 Sun Jul 30 02:53:13 2023
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sun May 19 18:27:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.52 2023/07/30 06:53:13 rin Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.53 2024/05/19 22:27:15 christos Exp $ */
/*
* System call argument to DTrace register array conversion.
@@ -3269,7 +3269,7 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_dup3 */
case 454: {
- const struct netbsd32_dup3_args *p = params;
+ const struct compat_110_netbsd32_dup3_args *p = params;
iarg[0] = SCARG(p, from); /* int */
iarg[1] = SCARG(p, to); /* int */
iarg[2] = SCARG(p, flags); /* int */
@@ -3752,6 +3752,15 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
+ /* netbsd32___dup3110 */
+ case 505: {
+ const struct netbsd32___dup3110_args *p = params;
+ iarg[0] = SCARG(p, from); /* int */
+ iarg[1] = SCARG(p, to); /* int */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -10160,6 +10169,22 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* netbsd32___dup3110 */
+ case 505:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -12277,6 +12302,11 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* netbsd32___dup3110 */
+ case 505:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.341 src/sys/kern/init_sysent.c:1.342
--- src/sys/kern/init_sysent.c:1.341 Fri Jul 28 14:20:28 2023
+++ src/sys/kern/init_sysent.c Sun May 19 18:27:15 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.341 2023/07/28 18:20:28 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.342 2024/05/19 22:27:15 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp
+ * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.341 2023/07/28 18:20:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.342 2024/05/19 22:27:15 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -133,6 +133,12 @@ __KERNEL_RCSID(0, "$NetBSD: init_sysent.
#define compat_100(func) sys_nosys
#endif
+#ifdef COMPAT_110
+#define compat_110(func) __CONCAT(compat_110_,func)
+#else
+#define compat_110(func) sys_nosys
+#endif
+
#define s(type) sizeof(type)
#define n(type) (sizeof(type)/sizeof (register_t))
#define ns(type) .sy_narg = n(type), .sy_argsize = s(type)
@@ -2217,9 +2223,9 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_pipe2
}, /* 453 = pipe2 */
{
- ns(struct sys_dup3_args),
- .sy_call = (sy_call_t *)sys_dup3
- }, /* 454 = dup3 */
+ ns(struct compat_110_sys_dup3_args),
+ .sy_call = (sy_call_t *)sys_nomodule
+ }, /* 454 = compat_110_dup3 */
{
ns(struct sys_kqueue1_args),
.sy_call = (sy_call_t *)sys_kqueue1
@@ -2468,8 +2474,9 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_epoll_pwait2
}, /* 504 = epoll_pwait2 */
{
- .sy_call = sys_nosys,
- }, /* 505 = filler */
+ ns(struct sys___dup3110_args),
+ .sy_call = (sy_call_t *)sys___dup3110
+ }, /* 505 = __dup3110 */
{
.sy_call = sys_nosys,
}, /* 506 = filler */
@@ -2505,6 +2512,6 @@ const uint32_t sysent_nomodbits[] = {
0x006000f0, /* syscalls 352-383 */
0x007fe338, /* syscalls 384-415 */
0x1c4f0040, /* syscalls 416-447 */
- 0x00000000, /* syscalls 448-479 */
+ 0x00000040, /* syscalls 448-479 */
0x00000000, /* syscalls 480-511 */
};
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.329 src/sys/kern/syscalls.c:1.330
--- src/sys/kern/syscalls.c:1.329 Fri Jul 28 14:20:28 2023
+++ src/sys/kern/syscalls.c Sun May 19 18:27:15 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.329 2023/07/28 18:20:28 christos Exp $ */
+/* $NetBSD: syscalls.c,v 1.330 2024/05/19 22:27:15 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp
+ * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.329 2023/07/28 18:20:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.330 2024/05/19 22:27:15 christos Exp $");
#if defined(_KERNEL_OPT)
#ifdef _KERNEL_OPT
@@ -504,7 +504,7 @@ const char *const syscallnames[] = {
/* 451 */ "__fhstat50",
/* 452 */ "#452 (obsolete 5.99 quotactl)",
/* 453 */ "pipe2",
- /* 454 */ "dup3",
+ /* 454 */ "compat_110_dup3",
/* 455 */ "kqueue1",
/* 456 */ "paccept",
/* 457 */ "linkat",
@@ -555,7 +555,7 @@ const char *const syscallnames[] = {
/* 502 */ "epoll_create1",
/* 503 */ "epoll_ctl",
/* 504 */ "epoll_pwait2",
- /* 505 */ "# filler",
+ /* 505 */ "__dup3110",
/* 506 */ "# filler",
/* 507 */ "# filler",
/* 508 */ "# filler",
@@ -1041,7 +1041,7 @@ const char *const altsyscallnames[] = {
/* 451 */ "fhstat",
/* 452 */ NULL, /* obsolete 5.99 quotactl */
/* 453 */ NULL, /* pipe2 */
- /* 454 */ NULL, /* dup3 */
+ /* 454 */ NULL, /* compat_110_dup3 */
/* 455 */ NULL, /* kqueue1 */
/* 456 */ NULL, /* paccept */
/* 457 */ NULL, /* linkat */
@@ -1092,7 +1092,7 @@ const char *const altsyscallnames[] = {
/* 502 */ NULL, /* epoll_create1 */
/* 503 */ NULL, /* epoll_ctl */
/* 504 */ NULL, /* epoll_pwait2 */
- /* 505 */ NULL, /* filler */
+ /* 505 */ "dup3",
/* 506 */ NULL, /* filler */
/* 507 */ NULL, /* filler */
/* 508 */ NULL, /* filler */
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.45 src/sys/kern/syscalls_autoload.c:1.46
--- src/sys/kern/syscalls_autoload.c:1.45 Fri Jul 28 14:20:28 2023
+++ src/sys/kern/syscalls_autoload.c Sun May 19 18:27:15 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.45 2023/07/28 18:20:28 christos Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.46 2024/05/19 22:27:15 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp
+ * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.45 2023/07/28 18:20:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.46 2024/05/19 22:27:15 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -208,5 +208,6 @@ static struct sc_autoload netbsd_syscall
#if defined(NTP) || !defined(_KERNEL_OPT)
#else
#endif
+ { SYS_compat_110_dup3, "compat_110" },
{ 0, NULL }
};
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.51 src/sys/kern/systrace_args.c:1.52
--- src/sys/kern/systrace_args.c:1.51 Fri Jul 28 14:20:28 2023
+++ src/sys/kern/systrace_args.c Sun May 19 18:27:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.51 2023/07/28 18:20:28 christos Exp $ */
+/* $NetBSD: systrace_args.c,v 1.52 2024/05/19 22:27:15 christos Exp $ */
/*
* System call argument to DTrace register array conversion.
@@ -3452,7 +3452,7 @@ systrace_args(register_t sysnum, const v
}
/* sys_dup3 */
case 454: {
- const struct sys_dup3_args *p = params;
+ const struct compat_110_sys_dup3_args *p = params;
iarg[0] = SCARG(p, from); /* int */
iarg[1] = SCARG(p, to); /* int */
iarg[2] = SCARG(p, flags); /* int */
@@ -3935,6 +3935,15 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
+ /* sys___dup3110 */
+ case 505: {
+ const struct sys___dup3110_args *p = params;
+ iarg[0] = SCARG(p, from); /* int */
+ iarg[1] = SCARG(p, to); /* int */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -10629,6 +10638,22 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* sys___dup3110 */
+ case 505:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -12856,6 +12881,11 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* sys___dup3110 */
+ case 505:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.128 src/sys/rump/include/rump/rump_syscalls.h:1.129
--- src/sys/rump/include/rump/rump_syscalls.h:1.128 Fri Jul 28 14:20:28 2023
+++ src/sys/rump/include/rump/rump_syscalls.h Sun May 19 18:27:16 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.128 2023/07/28 18:20:28 christos Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.129 2024/05/19 22:27:16 christos Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp
+ * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -193,7 +193,7 @@
#endif
#ifndef RUMP_SYS_RENAME_DUP3
-#define RUMP_SYS_RENAME_DUP3 rump___sysimpl_dup3
+#define RUMP_SYS_RENAME_DUP3 rump___sysimpl_dup3110
#endif
#ifndef RUMP_SYS_RENAME_EXTATTR_DELETE_FD
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.159 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.160
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.159 Fri Jul 28 14:20:29 2023
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sun May 19 18:27:16 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.159 2023/07/28 18:20:29 christos Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.160 2024/05/19 22:27:16 christos Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp
+ * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.159 2023/07/28 18:20:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.160 2024/05/19 22:27:16 christos Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -5701,6 +5701,7 @@ __weak_alias(_pipe2,rump___sysimpl_pipe2
__strong_alias(_sys_pipe2,rump___sysimpl_pipe2);
#endif /* RUMP_KERNEL_IS_LIBC */
+#ifdef RUMP_SYS_COMPAT
int rump___sysimpl_dup3(int, int, int);
int
rump___sysimpl_dup3(int from, int to, int flags)
@@ -5708,14 +5709,14 @@ rump___sysimpl_dup3(int from, int to, in
register_t retval[2];
int error = 0;
int rv = -1;
- struct sys_dup3_args callarg;
+ struct compat_110_sys_dup3_args callarg;
memset(&callarg, 0, sizeof(callarg));
SPARG(&callarg, from) = from;
SPARG(&callarg, to) = to;
SPARG(&callarg, flags) = flags;
- error = rsys_syscall(SYS_dup3, &callarg, sizeof(callarg), retval);
+ error = rsys_syscall(SYS_compat_110_dup3, &callarg, sizeof(callarg), retval);
rsys_seterrno(error);
if (error == 0) {
if (sizeof(int) > sizeof(register_t))
@@ -5730,6 +5731,7 @@ __weak_alias(dup3,rump___sysimpl_dup3);
__weak_alias(_dup3,rump___sysimpl_dup3);
__strong_alias(_sys_dup3,rump___sysimpl_dup3);
#endif /* RUMP_KERNEL_IS_LIBC */
+#endif /* RUMP_SYS_COMPAT */
int rump___sysimpl_kqueue1(int);
int
@@ -6648,6 +6650,37 @@ __weak_alias(___kevent100,rump___sysimpl
__strong_alias(_sys___kevent100,rump___sysimpl_kevent100);
#endif /* RUMP_KERNEL_IS_LIBC */
+int rump___sysimpl_dup3110(int, int, int);
+int
+rump___sysimpl_dup3110(int from, int to, int flags)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___dup3110_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, from) = from;
+ SPARG(&callarg, to) = to;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS___dup3110, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+#ifdef RUMP_KERNEL_IS_LIBC
+__weak_alias(dup3,rump___sysimpl_dup3110);
+__weak_alias(__dup3110,rump___sysimpl_dup3110);
+__weak_alias(___dup3110,rump___sysimpl_dup3110);
+__strong_alias(_sys___dup3110,rump___sysimpl_dup3110);
+#endif /* RUMP_KERNEL_IS_LIBC */
+
int rump_sys_pipe(int *);
int
rump_sys_pipe(int *fd)
@@ -8439,9 +8472,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
}, /* 453 = pipe2 */
{
- ns(struct sys_dup3_args),
- .sy_call = (sy_call_t *)(void *)rumpns_enosys,
- }, /* 454 = dup3 */
+ ns(struct compat_110_sys_dup3_args),
+ .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule,
+ }, /* 454 = compat_110_dup3 */
{
ns(struct sys_kqueue1_args),
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
@@ -8623,9 +8656,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
}, /* 504 = epoll_pwait2 */
{
- .sy_flags = SYCALL_NOSYS,
+ ns(struct sys___dup3110_args),
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
- }, /* 505 = filler */
+ }, /* 505 = __dup3110 */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
@@ -8667,7 +8700,7 @@ const uint32_t rump_sysent_nomodbits[] =
0x006000f0, /* syscalls 352-383 */
0x007fe338, /* syscalls 384-415 */
0x1c4f0040, /* syscalls 416-447 */
- 0x00000000, /* syscalls 448-479 */
+ 0x00000040, /* syscalls 448-479 */
0x00000000, /* syscalls 480-511 */
};
CTASSERT(__arraycount(rump_sysent) == SYS_NSYSENT);
Index: src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.9 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.10
--- src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.9 Sat Jul 29 11:11:04 2023
+++ src/sys/rump/librump/rumpkern/rumpkern_syscalls.c Sun May 19 18:27:16 2024
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpkern_syscalls.c,v 1.9 2023/07/29 15:11:04 rin Exp $ */
+/* $NetBSD: rumpkern_syscalls.c,v 1.10 2024/05/19 22:27:16 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.9 2023/07/29 15:11:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.10 2024/05/19 22:27:16 christos Exp $");
#include <sys/param.h>
Index: src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
diff -u src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.8 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.9
--- src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.8 Sat Jul 29 11:11:04 2023
+++ src/sys/rump/librump/rumpnet/rumpnet_syscalls.c Sun May 19 18:27:16 2024
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpnet_syscalls.c,v 1.8 2023/07/29 15:11:04 rin Exp $ */
+/* $NetBSD: rumpnet_syscalls.c,v 1.9 2024/05/19 22:27:16 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.8 2023/07/29 15:11:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.9 2024/05/19 22:27:16 christos Exp $");
#include <sys/param.h>
Index: src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
diff -u src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.10 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.11
--- src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.10 Sat Jul 29 11:11:04 2023
+++ src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c Sun May 19 18:27:16 2024
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpvfs_syscalls.c,v 1.10 2023/07/29 15:11:04 rin Exp $ */
+/* $NetBSD: rumpvfs_syscalls.c,v 1.11 2024/05/19 22:27:16 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.10 2023/07/29 15:11:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.11 2024/05/19 22:27:16 christos Exp $");
#include <sys/param.h>
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.324 src/sys/sys/syscall.h:1.325
--- src/sys/sys/syscall.h:1.324 Fri Jul 28 14:20:28 2023
+++ src/sys/sys/syscall.h Sun May 19 18:27:15 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.324 2023/07/28 18:20:28 christos Exp $ */
+/* $NetBSD: syscall.h,v 1.325 2024/05/19 22:27:15 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp
+ * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -1266,8 +1266,8 @@
/* syscall: "pipe2" ret: "int" args: "int *" "int" */
#define SYS_pipe2 453
-/* syscall: "dup3" ret: "int" args: "int" "int" "int" */
-#define SYS_dup3 454
+/* syscall: "compat_110_dup3" ret: "int" args: "int" "int" "int" */
+#define SYS_compat_110_dup3 454
/* syscall: "kqueue1" ret: "int" args: "int" */
#define SYS_kqueue1 455
@@ -1419,6 +1419,9 @@
/* syscall: "epoll_pwait2" ret: "int" args: "int" "struct epoll_event *" "int" "const struct timespec *" "const sigset_t *" */
#define SYS_epoll_pwait2 504
-#define SYS_MAXSYSCALL 505
+/* syscall: "__dup3110" ret: "int" args: "int" "int" "int" */
+#define SYS___dup3110 505
+
+#define SYS_MAXSYSCALL 506
#define SYS_NSYSENT 512
#endif /* _SYS_SYSCALL_H_ */
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.307 src/sys/sys/syscallargs.h:1.308
--- src/sys/sys/syscallargs.h:1.307 Fri Jul 28 14:20:28 2023
+++ src/sys/sys/syscallargs.h Sun May 19 18:27:15 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.307 2023/07/28 18:20:28 christos Exp $ */
+/* $NetBSD: syscallargs.h,v 1.308 2024/05/19 22:27:15 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp
+ * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -2979,12 +2979,12 @@ struct sys_pipe2_args {
};
check_syscall_args(sys_pipe2)
-struct sys_dup3_args {
+struct compat_110_sys_dup3_args {
syscallarg(int) from;
syscallarg(int) to;
syscallarg(int) flags;
};
-check_syscall_args(sys_dup3)
+check_syscall_args(compat_110_sys_dup3)
struct sys_kqueue1_args {
syscallarg(int) flags;
@@ -3402,6 +3402,13 @@ struct sys_epoll_pwait2_args {
check_syscall_args(sys_epoll_pwait2)
#endif /* !RUMP_CLIENT */
+struct sys___dup3110_args {
+ syscallarg(int) from;
+ syscallarg(int) to;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys___dup3110)
+
/*
* System call prototypes.
*/
@@ -4234,7 +4241,7 @@ int sys___fhstat50(struct lwp *, const s
int sys_pipe2(struct lwp *, const struct sys_pipe2_args *, register_t *);
-int sys_dup3(struct lwp *, const struct sys_dup3_args *, register_t *);
+int compat_110_sys_dup3(struct lwp *, const struct compat_110_sys_dup3_args *, register_t *);
int sys_kqueue1(struct lwp *, const struct sys_kqueue1_args *, register_t *);
@@ -4336,5 +4343,7 @@ int sys_epoll_ctl(struct lwp *, const st
int sys_epoll_pwait2(struct lwp *, const struct sys_epoll_pwait2_args *, register_t *);
+int sys___dup3110(struct lwp *, const struct sys___dup3110_args *, register_t *);
+
#endif /* !RUMP_CLIENT */
#endif /* _SYS_SYSCALLARGS_H_ */
