Module Name: src
Committed By: rjs
Date: Tue Jul 31 21:02:01 UTC 2018
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.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.135 -r1.136 src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.134 -r1.135 src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.133 -r1.134 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.25 -r1.26 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.136 src/sys/compat/netbsd32/netbsd32_syscall.h:1.137
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.136 Thu Jul 12 10:46:48 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Jul 31 21:02:00 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.136 2018/07/12 10:46:48 maxv Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.137 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -518,6 +518,9 @@
/* syscall: "netbsd32_fpathconf" ret: "netbsd32_long" args: "int" "int" */
#define NETBSD32_SYS_netbsd32_fpathconf 192
+/* syscall: "netbsd32_getsockopt2" ret: "int" args: "int" "int" "int" "netbsd32_voidp" "netbsd32_intp" */
+#define NETBSD32_SYS_netbsd32_getsockopt2 193
+
/* syscall: "netbsd32_getrlimit" ret: "int" args: "int" "netbsd32_rlimitp_t" */
#define NETBSD32_SYS_netbsd32_getrlimit 194
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.135 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.136
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.135 Thu May 10 02:36:26 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Jul 31 21:02:00 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.135 2018/05/10 02:36:26 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.136 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -967,6 +967,15 @@ struct netbsd32_fpathconf_args {
};
check_syscall_args(netbsd32_fpathconf)
+struct netbsd32_getsockopt2_args {
+ syscallarg(int) s;
+ syscallarg(int) level;
+ syscallarg(int) name;
+ syscallarg(netbsd32_voidp) val;
+ syscallarg(netbsd32_intp) avalsize;
+};
+check_syscall_args(netbsd32_getsockopt2)
+
struct netbsd32_getrlimit_args {
syscallarg(int) which;
syscallarg(netbsd32_rlimitp_t) rlp;
@@ -2941,6 +2950,8 @@ int netbsd32_pathconf(struct lwp *, cons
int netbsd32_fpathconf(struct lwp *, const struct netbsd32_fpathconf_args *, register_t *);
+int netbsd32_getsockopt2(struct lwp *, const struct netbsd32_getsockopt2_args *, register_t *);
+
int netbsd32_getrlimit(struct lwp *, const struct netbsd32_getrlimit_args *, register_t *);
int netbsd32_setrlimit(struct lwp *, const struct netbsd32_setrlimit_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.134 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.135
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.134 Thu Jul 12 10:46:48 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Jul 31 21:02:00 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.134 2018/07/12 10:46:48 maxv Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.135 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.134 2018/07/12 10:46:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.135 2018/07/31 21:02:00 rjs Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -226,7 +226,7 @@ const char *const netbsd32_syscallnames[
/* 190 */ "compat_12_netbsd32_lstat12",
/* 191 */ "netbsd32_pathconf",
/* 192 */ "netbsd32_fpathconf",
- /* 193 */ "#193 (unimplemented)",
+ /* 193 */ "netbsd32_getsockopt2",
/* 194 */ "netbsd32_getrlimit",
/* 195 */ "netbsd32_setrlimit",
/* 196 */ "compat_12_netbsd32_getdirentries",
@@ -756,7 +756,7 @@ const char *const altnetbsd32_syscallnam
/* 190 */ NULL, /* compat_12_netbsd32_lstat12 */
/* 191 */ "pathconf",
/* 192 */ "fpathconf",
- /* 193 */ NULL, /* unimplemented */
+ /* 193 */ "getsockopt2",
/* 194 */ "getrlimit",
/* 195 */ "setrlimit",
/* 196 */ NULL, /* compat_12_netbsd32_getdirentries */
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.14 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.15
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.14 Thu May 10 02:36:26 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Tue Jul 31 21:02:00 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.14 2018/05/10 02:36:26 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.15 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.14 2018/05/10 02:36:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.15 2018/07/31 21:02:00 rjs Exp $");
#include <sys/proc.h>
static struct sc_autoload netbsd32_syscalls_autoload[] = {
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.133 src/sys/compat/netbsd32/netbsd32_sysent.c:1.134
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.133 Thu May 10 02:36:26 2018
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Tue Jul 31 21:02:00 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.133 2018/05/10 02:36:26 christos Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.134 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.133 2018/05/10 02:36:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.134 2018/07/31 21:02:00 rjs Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -854,8 +854,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_fpathconf
}, /* 192 = netbsd32_fpathconf */
{
- .sy_call = sys_nosys,
- }, /* 193 = filler */
+ ns(struct netbsd32_getsockopt2_args),
+ .sy_call = (sy_call_t *)netbsd32_getsockopt2
+ }, /* 193 = netbsd32_getsockopt2 */
{
ns(struct netbsd32_getrlimit_args),
.sy_call = (sy_call_t *)netbsd32_getrlimit
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.25 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.26
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.25 Thu May 10 02:36:26 2018
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Tue Jul 31 21:02:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.25 2018/05/10 02:36:26 christos Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.26 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1324,6 +1324,17 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
+ /* netbsd32_getsockopt2 */
+ case 193: {
+ const struct netbsd32_getsockopt2_args *p = params;
+ iarg[0] = SCARG(p, s); /* int */
+ iarg[1] = SCARG(p, level); /* int */
+ iarg[2] = SCARG(p, name); /* int */
+ uarg[3] = (intptr_t) SCARG(p, val).i32; /* netbsd32_voidp */
+ uarg[4] = (intptr_t) SCARG(p, avalsize).i32; /* netbsd32_intp */
+ *n_args = 5;
+ break;
+ }
/* netbsd32_getrlimit */
case 194: {
const struct netbsd32_getrlimit_args *p = params;
@@ -5618,6 +5629,28 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* netbsd32_getsockopt2 */
+ case 193:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "int";
+ break;
+ case 3:
+ p = "netbsd32_voidp";
+ break;
+ case 4:
+ p = "netbsd32_intp";
+ break;
+ default:
+ break;
+ };
+ break;
/* netbsd32_getrlimit */
case 194:
switch(ndx) {
@@ -10157,6 +10190,11 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "netbsd32_long";
break;
+ /* netbsd32_getsockopt2 */
+ case 193:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* netbsd32_getrlimit */
case 194:
if (ndx == 0 || ndx == 1)
