Module Name: src
Committed By: martin
Date: Fri Feb 3 06:07:29 UTC 2017
Modified Files:
src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
Log Message:
Regen for accept4
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/compat/linux/arch/alpha/linux_syscall.h \
src/sys/compat/linux/arch/alpha/linux_sysent.c
cvs rdiff -u -r1.102 -r1.103 \
src/sys/compat/linux/arch/alpha/linux_syscallargs.h
cvs rdiff -u -r1.104 -r1.105 src/sys/compat/linux/arch/alpha/linux_syscalls.c
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/arm/linux_syscall.h \
src/sys/compat/linux/arch/arm/linux_syscallargs.h \
src/sys/compat/linux/arch/arm/linux_syscalls.c \
src/sys/compat/linux/arch/arm/linux_sysent.c
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux/arch/arm/linux_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/linux/arch/alpha/linux_syscall.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.103 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.104
--- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.103 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/alpha/linux_syscall.h Fri Feb 3 06:07:29 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.103 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.104 2017/02/03 06:07:29 martin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.92 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.93 2017/02/03 06:06:08 martin Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -660,6 +660,9 @@
/* syscall: "pipe2" ret: "int" args: "int *" "int" */
#define LINUX_SYS_pipe2 488
-#define LINUX_SYS_MAXSYSCALL 494
+/* syscall: "accept4" ret: "int" args: "int" "struct osockaddr *" "int *" "int" */
+#define LINUX_SYS_accept4 502
+
+#define LINUX_SYS_MAXSYSCALL 503
#define LINUX_SYS_NSYSENT 512
#endif /* _LINUX_SYS_SYSCALL_H_ */
Index: src/sys/compat/linux/arch/alpha/linux_sysent.c
diff -u src/sys/compat/linux/arch/alpha/linux_sysent.c:1.103 src/sys/compat/linux/arch/alpha/linux_sysent.c:1.104
--- src/sys/compat/linux/arch/alpha/linux_sysent.c:1.103 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/alpha/linux_sysent.c Fri Feb 3 06:07:29 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.103 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.104 2017/02/03 06:07:29 martin Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.92 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.93 2017/02/03 06:06:08 martin Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.103 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.104 2017/02/03 06:07:29 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -1969,8 +1969,10 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 501 = filler */
{
- .sy_call = linux_sys_nosys,
- }, /* 502 = filler */
+ ns(struct linux_sys_accept4_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)linux_sys_accept4
+ }, /* 502 = accept4 */
{
.sy_call = linux_sys_nosys,
}, /* 503 = filler */
Index: src/sys/compat/linux/arch/alpha/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.102 src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.103
--- src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.102 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/alpha/linux_syscallargs.h Fri Feb 3 06:07:29 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.102 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.103 2017/02/03 06:07:29 martin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.92 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.93 2017/02/03 06:06:08 martin Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1127,6 +1127,14 @@ struct linux_sys_pipe2_args {
};
check_syscall_args(linux_sys_pipe2)
+struct linux_sys_accept4_args {
+ syscallarg(int) s;
+ syscallarg(struct osockaddr *) name;
+ syscallarg(int *) anamelen;
+ syscallarg(int) flags;
+};
+check_syscall_args(linux_sys_accept4)
+
/*
* System call prototypes.
*/
@@ -1597,4 +1605,6 @@ int linux_sys_dup3(struct lwp *, const s
int linux_sys_pipe2(struct lwp *, const struct linux_sys_pipe2_args *, register_t *);
+int linux_sys_accept4(struct lwp *, const struct linux_sys_accept4_args *, register_t *);
+
#endif /* _LINUX_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/linux/arch/alpha/linux_syscalls.c
diff -u src/sys/compat/linux/arch/alpha/linux_syscalls.c:1.104 src/sys/compat/linux/arch/alpha/linux_syscalls.c:1.105
--- src/sys/compat/linux/arch/alpha/linux_syscalls.c:1.104 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/alpha/linux_syscalls.c Fri Feb 3 06:07:29 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.104 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.105 2017/02/03 06:07:29 martin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.92 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.93 2017/02/03 06:06:08 martin Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.104 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.105 2017/02/03 06:07:29 martin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -552,15 +552,15 @@ const char *const linux_syscallnames[] =
/* 491 */ "#491 (unimplemented pwritev)",
/* 492 */ "#492 (unimplemented rt_tgsigqueueinfo)",
/* 493 */ "#493 (unimplemented perf_counter_open)",
- /* 494 */ "# filler",
- /* 495 */ "# filler",
- /* 496 */ "# filler",
- /* 497 */ "# filler",
- /* 498 */ "# filler",
- /* 499 */ "# filler",
- /* 500 */ "# filler",
- /* 501 */ "# filler",
- /* 502 */ "# filler",
+ /* 494 */ "#494 (unimplemented)",
+ /* 495 */ "#495 (unimplemented)",
+ /* 496 */ "#496 (unimplemented)",
+ /* 497 */ "#497 (unimplemented)",
+ /* 498 */ "#498 (unimplemented)",
+ /* 499 */ "#499 (unimplemented)",
+ /* 500 */ "#500 (unimplemented)",
+ /* 501 */ "#501 (unimplemented)",
+ /* 502 */ "accept4",
/* 503 */ "# filler",
/* 504 */ "# filler",
/* 505 */ "# filler",
@@ -1093,15 +1093,15 @@ const char *const altlinux_syscallnames[
/* 491 */ NULL, /* unimplemented pwritev */
/* 492 */ NULL, /* unimplemented rt_tgsigqueueinfo */
/* 493 */ NULL, /* unimplemented perf_counter_open */
- /* 494 */ NULL, /* filler */
- /* 495 */ NULL, /* filler */
- /* 496 */ NULL, /* filler */
- /* 497 */ NULL, /* filler */
- /* 498 */ NULL, /* filler */
- /* 499 */ NULL, /* filler */
- /* 500 */ NULL, /* filler */
- /* 501 */ NULL, /* filler */
- /* 502 */ NULL, /* filler */
+ /* 494 */ NULL, /* unimplemented */
+ /* 495 */ NULL, /* unimplemented */
+ /* 496 */ NULL, /* unimplemented */
+ /* 497 */ NULL, /* unimplemented */
+ /* 498 */ NULL, /* unimplemented */
+ /* 499 */ NULL, /* unimplemented */
+ /* 500 */ NULL, /* unimplemented */
+ /* 501 */ NULL, /* unimplemented */
+ /* 502 */ NULL, /* accept4 */
/* 503 */ NULL, /* filler */
/* 504 */ NULL, /* filler */
/* 505 */ NULL, /* filler */
Index: src/sys/compat/linux/arch/arm/linux_syscall.h
diff -u src/sys/compat/linux/arch/arm/linux_syscall.h:1.76 src/sys/compat/linux/arch/arm/linux_syscall.h:1.77
--- src/sys/compat/linux/arch/arm/linux_syscall.h:1.76 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/arm/linux_syscall.h Fri Feb 3 06:07:29 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.76 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.77 2017/02/03 06:07:29 martin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.65 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -709,6 +709,9 @@
/* syscall: "pipe2" ret: "int" args: "int *" "int" */
#define LINUX_SYS_pipe2 359
+/* syscall: "accept4" ret: "int" args: "int" "struct osockaddr *" "int *" "int" */
+#define LINUX_SYS_accept4 366
+
/* syscall: "breakpoint" ret: "int" args: */
#define LINUX_SYS_breakpoint 385
Index: src/sys/compat/linux/arch/arm/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.76 src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.77
--- src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.76 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/arm/linux_syscallargs.h Fri Feb 3 06:07:29 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.76 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.77 2017/02/03 06:07:29 martin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.65 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1091,6 +1091,14 @@ struct linux_sys_pipe2_args {
};
check_syscall_args(linux_sys_pipe2)
+struct linux_sys_accept4_args {
+ syscallarg(int) s;
+ syscallarg(struct osockaddr *) name;
+ syscallarg(int *) anamelen;
+ syscallarg(int) flags;
+};
+check_syscall_args(linux_sys_accept4)
+
struct linux_sys_cacheflush_args {
syscallarg(uintptr_t) from;
syscallarg(intptr_t) to;
@@ -1549,6 +1557,8 @@ int linux_sys_dup3(struct lwp *, const s
int linux_sys_pipe2(struct lwp *, const struct linux_sys_pipe2_args *, register_t *);
+int linux_sys_accept4(struct lwp *, const struct linux_sys_accept4_args *, register_t *);
+
int linux_sys_breakpoint(struct lwp *, const void *, register_t *);
int linux_sys_cacheflush(struct lwp *, const struct linux_sys_cacheflush_args *, register_t *);
Index: src/sys/compat/linux/arch/arm/linux_syscalls.c
diff -u src/sys/compat/linux/arch/arm/linux_syscalls.c:1.76 src/sys/compat/linux/arch/arm/linux_syscalls.c:1.77
--- src/sys/compat/linux/arch/arm/linux_syscalls.c:1.76 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/arm/linux_syscalls.c Fri Feb 3 06:07:29 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.76 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.77 2017/02/03 06:07:29 martin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.65 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.76 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.77 2017/02/03 06:07:29 martin Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -401,7 +401,7 @@ const char *const linux_syscallnames[] =
/* 363 */ "#363 (unimplemented rt_tgsigqueueinfo)",
/* 364 */ "#364 (unimplemented perf_counter_open)",
/* 365 */ "#365 (unimplemented recvmmsg)",
- /* 366 */ "#366 (unimplemented)",
+ /* 366 */ "accept4",
/* 367 */ "#367 (unimplemented)",
/* 368 */ "#368 (unimplemented)",
/* 369 */ "#369 (unimplemented)",
@@ -923,7 +923,7 @@ const char *const altlinux_syscallnames[
/* 363 */ NULL, /* unimplemented rt_tgsigqueueinfo */
/* 364 */ NULL, /* unimplemented perf_counter_open */
/* 365 */ NULL, /* unimplemented recvmmsg */
- /* 366 */ NULL, /* unimplemented */
+ /* 366 */ NULL, /* accept4 */
/* 367 */ NULL, /* unimplemented */
/* 368 */ NULL, /* unimplemented */
/* 369 */ NULL, /* unimplemented */
Index: src/sys/compat/linux/arch/arm/linux_sysent.c
diff -u src/sys/compat/linux/arch/arm/linux_sysent.c:1.76 src/sys/compat/linux/arch/arm/linux_sysent.c:1.77
--- src/sys/compat/linux/arch/arm/linux_sysent.c:1.76 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/arm/linux_sysent.c Fri Feb 3 06:07:29 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.76 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.77 2017/02/03 06:07:29 martin Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.65 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.76 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.77 2017/02/03 06:07:29 martin Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1497,8 +1497,10 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 365 = filler */
{
- .sy_call = linux_sys_nosys,
- }, /* 366 = filler */
+ ns(struct linux_sys_accept4_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)linux_sys_accept4
+ }, /* 366 = accept4 */
{
.sy_call = linux_sys_nosys,
}, /* 367 = filler */
Index: src/sys/compat/linux/arch/arm/linux_systrace_args.c
diff -u src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.9 src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.10
--- src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.9 Mon Jan 16 00:11:09 2017
+++ src/sys/compat/linux/arch/arm/linux_systrace_args.c Fri Feb 3 06:07:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_systrace_args.c,v 1.9 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.10 2017/02/03 06:07:29 martin Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1859,6 +1859,16 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
+ /* linux_sys_accept4 */
+ case 366: {
+ const struct linux_sys_accept4_args *p = params;
+ iarg[0] = SCARG(p, s); /* int */
+ uarg[1] = (intptr_t) SCARG(p, name); /* struct osockaddr * */
+ uarg[2] = (intptr_t) SCARG(p, anamelen); /* int * */
+ iarg[3] = SCARG(p, flags); /* int */
+ *n_args = 4;
+ break;
+ }
/* linux_sys_breakpoint */
case 385: {
*n_args = 0;
@@ -4905,6 +4915,25 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* linux_sys_accept4 */
+ case 366:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "struct osockaddr *";
+ break;
+ case 2:
+ p = "int *";
+ break;
+ case 3:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
/* linux_sys_breakpoint */
case 385:
break;
@@ -6021,6 +6050,11 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* linux_sys_accept4 */
+ case 366:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_sys_breakpoint */
case 385:
/* linux_sys_cacheflush */
