Module Name: src
Committed By: christos
Date: Sun Jun 26 17:05:55 UTC 2011
Modified Files:
src/sys/kern: init_sysent.c syscalls.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.245 -r1.246 src/sys/kern/syscalls.c
cvs rdiff -u -r1.49 -r1.50 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.71 -r1.72 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.241 -r1.242 src/sys/sys/syscall.h
cvs rdiff -u -r1.224 -r1.225 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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.254 src/sys/kern/init_sysent.c:1.255
--- src/sys/kern/init_sysent.c:1.254 Sun Mar 6 12:08:36 2011
+++ src/sys/kern/init_sysent.c Sun Jun 26 13:05:55 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.254 2011/03/06 17:08:36 bouyer Exp $ */
+/* $NetBSD: init_sysent.c,v 1.255 2011/06/26 17:05:55 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD
+ * created from NetBSD: syscalls.master,v 1.249 2011/06/26 17:05:24 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.254 2011/03/06 17:08:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.255 2011/06/26 17:05:55 christos Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
@@ -16,6 +16,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/signal.h>
+#include <sys/socket.h>
#include <sys/mount.h>
#include <sys/sched.h>
#include <sys/syscallargs.h>
@@ -1097,14 +1098,14 @@
(sy_call_t *)sys___fhstat50 }, /* 451 = __fhstat50 */
{ ns(struct sys___quotactl50_args), 0,
(sy_call_t *)sys___quotactl50 }, /* 452 = __quotactl50 */
- { 0, 0, 0,
- sys_nosys }, /* 453 = filler */
- { 0, 0, 0,
- sys_nosys }, /* 454 = filler */
- { 0, 0, 0,
- sys_nosys }, /* 455 = filler */
- { 0, 0, 0,
- sys_nosys }, /* 456 = filler */
+ { ns(struct sys_pipe2_args), 0,
+ (sy_call_t *)sys_pipe2 }, /* 453 = pipe2 */
+ { ns(struct sys_dup3_args), 0,
+ (sy_call_t *)sys_dup3 }, /* 454 = dup3 */
+ { ns(struct sys_kqueue1_args), 0,
+ (sy_call_t *)sys_kqueue1 }, /* 455 = kqueue1 */
+ { ns(struct sys_paccept_args), 0,
+ (sy_call_t *)sys_paccept }, /* 456 = paccept */
{ 0, 0, 0,
sys_nosys }, /* 457 = filler */
{ 0, 0, 0,
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.245 src/sys/kern/syscalls.c:1.246
--- src/sys/kern/syscalls.c:1.245 Sun Mar 6 12:08:36 2011
+++ src/sys/kern/syscalls.c Sun Jun 26 13:05:55 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.245 2011/03/06 17:08:36 bouyer Exp $ */
+/* $NetBSD: syscalls.c,v 1.246 2011/06/26 17:05:55 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD
+ * created from NetBSD: syscalls.master,v 1.249 2011/06/26 17:05:24 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.245 2011/03/06 17:08:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.246 2011/06/26 17:05:55 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
@@ -17,6 +17,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/signal.h>
+#include <sys/socket.h>
#include <sys/mount.h>
#include <sys/sched.h>
#include <sys/syscallargs.h>
@@ -541,10 +542,10 @@
/* 450 */ "__mknod50",
/* 451 */ "__fhstat50",
/* 452 */ "__quotactl50",
- /* 453 */ "# filler",
- /* 454 */ "# filler",
- /* 455 */ "# filler",
- /* 456 */ "# filler",
+ /* 453 */ "pipe2",
+ /* 454 */ "dup3",
+ /* 455 */ "kqueue1",
+ /* 456 */ "paccept",
/* 457 */ "# filler",
/* 458 */ "# filler",
/* 459 */ "# filler",
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.49 src/sys/rump/include/rump/rump_syscalls.h:1.50
--- src/sys/rump/include/rump/rump_syscalls.h:1.49 Tue Mar 8 13:31:11 2011
+++ src/sys/rump/include/rump/rump_syscalls.h Sun Jun 26 13:05:55 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.49 2011/03/08 18:31:11 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.50 2011/06/26 17:05:55 christos Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.246 2011/03/06 17:08:36 bouyer Exp
+ * created from NetBSD: syscalls.master,v 1.249 2011/06/26 17:05:24 christos Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -16,8 +16,8 @@
#include <sys/types.h> /* typedefs */
#include <sys/select.h> /* typedefs */
-
-#include <signal.h> /* typedefs */
+#include <sys/sigtypes.h> /* typedefs */
+#include <sys/socket.h> /* typedefs */
#include <rump/rump_syscalls_compat.h>
@@ -81,6 +81,10 @@
#define RUMP_SYS_RENAME_LISTXATTR rump___sysimpl_listxattr
#endif
+#ifndef RUMP_SYS_RENAME_PIPE2
+#define RUMP_SYS_RENAME_PIPE2 rump___sysimpl_pipe2
+#endif
+
#ifndef RUMP_SYS_RENAME_EXTATTR_GET_FD
#define RUMP_SYS_RENAME_EXTATTR_GET_FD rump___sysimpl_extattr_get_fd
#endif
@@ -161,6 +165,10 @@
#define RUMP_SYS_RENAME_EXTATTR_SET_LINK rump___sysimpl_extattr_set_link
#endif
+#ifndef RUMP_SYS_RENAME_PACCEPT
+#define RUMP_SYS_RENAME_PACCEPT rump___sysimpl_paccept
+#endif
+
#ifndef RUMP_SYS_RENAME_EXTATTR_LIST_FILE
#define RUMP_SYS_RENAME_EXTATTR_LIST_FILE rump___sysimpl_extattr_list_file
#endif
@@ -181,6 +189,10 @@
#define RUMP_SYS_RENAME_DUP2 rump___sysimpl_dup2
#endif
+#ifndef RUMP_SYS_RENAME_DUP3
+#define RUMP_SYS_RENAME_DUP3 rump___sysimpl_dup3
+#endif
+
#ifndef RUMP_SYS_RENAME_FHOPEN
#define RUMP_SYS_RENAME_FHOPEN rump___sysimpl_fhopen40
#endif
@@ -245,6 +257,10 @@
#define RUMP_SYS_RENAME_RMDIR rump___sysimpl_rmdir
#endif
+#ifndef RUMP_SYS_RENAME_KQUEUE1
+#define RUMP_SYS_RENAME_KQUEUE1 rump___sysimpl_kqueue1
+#endif
+
#ifndef RUMP_SYS_RENAME_GETGID_WITH_EGID
#define RUMP_SYS_RENAME_GETGID_WITH_EGID rump___sysimpl_getgid
#endif
@@ -655,10 +671,10 @@
uid_t rump_sys_geteuid(void) __RENAME(RUMP_SYS_RENAME_GETEUID);
ssize_t rump_sys_recvmsg(int, struct msghdr *, int) __RENAME(RUMP_SYS_RENAME_RECVMSG);
ssize_t rump_sys_sendmsg(int, const struct msghdr *, int) __RENAME(RUMP_SYS_RENAME_SENDMSG);
-ssize_t rump_sys_recvfrom(int, void *, size_t, int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_RECVFROM);
-int rump_sys_accept(int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_ACCEPT);
-int rump_sys_getpeername(int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_GETPEERNAME);
-int rump_sys_getsockname(int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_GETSOCKNAME);
+ssize_t rump_sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *) __RENAME(RUMP_SYS_RENAME_RECVFROM);
+int rump_sys_accept(int, struct sockaddr *, socklen_t *) __RENAME(RUMP_SYS_RENAME_ACCEPT);
+int rump_sys_getpeername(int, struct sockaddr *, socklen_t *) __RENAME(RUMP_SYS_RENAME_GETPEERNAME);
+int rump_sys_getsockname(int, struct sockaddr *, socklen_t *) __RENAME(RUMP_SYS_RENAME_GETSOCKNAME);
int rump_sys_access(const char *, int) __RENAME(RUMP_SYS_RENAME_ACCESS);
int rump_sys_chflags(const char *, u_long) __RENAME(RUMP_SYS_RENAME_CHFLAGS);
int rump_sys_fchflags(int, u_long) __RENAME(RUMP_SYS_RENAME_FCHFLAGS);
@@ -683,11 +699,11 @@
int rump_sys_fcntl(int, int, ...) __RENAME(RUMP_SYS_RENAME_FCNTL);
int rump_sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *) __RENAME(RUMP_SYS_RENAME_SELECT);
int rump_sys_fsync(int) __RENAME(RUMP_SYS_RENAME_FSYNC);
-int rump_sys_connect(int, const struct sockaddr *, unsigned int) __RENAME(RUMP_SYS_RENAME_CONNECT);
-int rump_sys_bind(int, const struct sockaddr *, unsigned int) __RENAME(RUMP_SYS_RENAME_BIND);
-int rump_sys_setsockopt(int, int, int, const void *, unsigned int) __RENAME(RUMP_SYS_RENAME_SETSOCKOPT);
+int rump_sys_connect(int, const struct sockaddr *, socklen_t) __RENAME(RUMP_SYS_RENAME_CONNECT);
+int rump_sys_bind(int, const struct sockaddr *, socklen_t) __RENAME(RUMP_SYS_RENAME_BIND);
+int rump_sys_setsockopt(int, int, int, const void *, socklen_t) __RENAME(RUMP_SYS_RENAME_SETSOCKOPT);
int rump_sys_listen(int, int) __RENAME(RUMP_SYS_RENAME_LISTEN);
-int rump_sys_getsockopt(int, int, int, void *, unsigned int *) __RENAME(RUMP_SYS_RENAME_GETSOCKOPT);
+int rump_sys_getsockopt(int, int, int, void *, socklen_t *) __RENAME(RUMP_SYS_RENAME_GETSOCKOPT);
ssize_t rump_sys_readv(int, const struct iovec *, int) __RENAME(RUMP_SYS_RENAME_READV);
ssize_t rump_sys_writev(int, const struct iovec *, int) __RENAME(RUMP_SYS_RENAME_WRITEV);
int rump_sys_fchown(int, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_FCHOWN);
@@ -697,7 +713,7 @@
int rump_sys_rename(const char *, const char *) __RENAME(RUMP_SYS_RENAME_RENAME);
int rump_sys_flock(int, int) __RENAME(RUMP_SYS_RENAME_FLOCK);
int rump_sys_mkfifo(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_MKFIFO);
-ssize_t rump_sys_sendto(int, const void *, size_t, int, const struct sockaddr *, unsigned int) __RENAME(RUMP_SYS_RENAME_SENDTO);
+ssize_t rump_sys_sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t) __RENAME(RUMP_SYS_RENAME_SENDTO);
int rump_sys_shutdown(int, int) __RENAME(RUMP_SYS_RENAME_SHUTDOWN);
int rump_sys_socketpair(int, int, int, int *) __RENAME(RUMP_SYS_RENAME_SOCKETPAIR);
int rump_sys_mkdir(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_MKDIR);
@@ -788,6 +804,10 @@
int rump_sys_mount(const char *, const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_MOUNT);
int rump_sys_posix_fadvise(int, off_t, off_t, int) __RENAME(RUMP_SYS_RENAME_POSIX_FADVISE);
int rump_sys_quotactl(const char *, struct plistref *) __RENAME(RUMP_SYS_RENAME_QUOTACTL);
+int rump_sys_pipe2(int *, int) __RENAME(RUMP_SYS_RENAME_PIPE2);
+int rump_sys_dup3(int, int, int) __RENAME(RUMP_SYS_RENAME_DUP3);
+int rump_sys_kqueue1(int) __RENAME(RUMP_SYS_RENAME_KQUEUE1);
+int rump_sys_paccept(int, struct sockaddr *, socklen_t *, const sigset_t *, int) __RENAME(RUMP_SYS_RENAME_PACCEPT);
int rump_sys_pipe(int *);
#endif /* _RUMP_RUMP_SYSCALLS_H_ */
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.71 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.72
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.71 Tue Mar 8 13:31:11 2011
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sun Jun 26 13:05:55 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.c,v 1.71 2011/03/08 18:31:11 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.72 2011/06/26 17:05:55 christos Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.246 2011/03/06 17:08:36 bouyer Exp
+ * created from NetBSD: syscalls.master,v 1.249 2011/06/26 17:05:24 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.71 2011/03/08 18:31:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.72 2011/06/26 17:05:55 christos Exp $");
#include <sys/param.h>
#include <sys/fstypes.h>
@@ -478,9 +478,9 @@
}
rsys_alias(sys_sendmsg,rump_enosys)
-ssize_t rump___sysimpl_recvfrom(int, void *, size_t, int, struct sockaddr *, unsigned int *);
+ssize_t rump___sysimpl_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
ssize_t
-rump___sysimpl_recvfrom(int s, void * buf, size_t len, int flags, struct sockaddr * from, unsigned int * fromlenaddr)
+rump___sysimpl_recvfrom(int s, void * buf, size_t len, int flags, struct sockaddr * from, socklen_t * fromlenaddr)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -506,9 +506,9 @@
}
rsys_alias(sys_recvfrom,rump_enosys)
-int rump___sysimpl_accept(int, struct sockaddr *, unsigned int *);
+int rump___sysimpl_accept(int, struct sockaddr *, socklen_t *);
int
-rump___sysimpl_accept(int s, struct sockaddr * name, unsigned int * anamelen)
+rump___sysimpl_accept(int s, struct sockaddr * name, socklen_t * anamelen)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -531,9 +531,9 @@
}
rsys_alias(sys_accept,rump_enosys)
-int rump___sysimpl_getpeername(int, struct sockaddr *, unsigned int *);
+int rump___sysimpl_getpeername(int, struct sockaddr *, socklen_t *);
int
-rump___sysimpl_getpeername(int fdes, struct sockaddr * asa, unsigned int * alen)
+rump___sysimpl_getpeername(int fdes, struct sockaddr * asa, socklen_t * alen)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -556,9 +556,9 @@
}
rsys_alias(sys_getpeername,rump_enosys)
-int rump___sysimpl_getsockname(int, struct sockaddr *, unsigned int *);
+int rump___sysimpl_getsockname(int, struct sockaddr *, socklen_t *);
int
-rump___sysimpl_getsockname(int fdes, struct sockaddr * asa, unsigned int * alen)
+rump___sysimpl_getsockname(int fdes, struct sockaddr * asa, socklen_t * alen)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -1115,9 +1115,9 @@
}
rsys_alias(sys_fsync,rump_enosys)
-int rump___sysimpl_connect(int, const struct sockaddr *, unsigned int);
+int rump___sysimpl_connect(int, const struct sockaddr *, socklen_t);
int
-rump___sysimpl_connect(int s, const struct sockaddr * name, unsigned int namelen)
+rump___sysimpl_connect(int s, const struct sockaddr * name, socklen_t namelen)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -1140,9 +1140,9 @@
}
rsys_alias(sys_connect,rump_enosys)
-int rump___sysimpl_bind(int, const struct sockaddr *, unsigned int);
+int rump___sysimpl_bind(int, const struct sockaddr *, socklen_t);
int
-rump___sysimpl_bind(int s, const struct sockaddr * name, unsigned int namelen)
+rump___sysimpl_bind(int s, const struct sockaddr * name, socklen_t namelen)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -1165,9 +1165,9 @@
}
rsys_alias(sys_bind,rump_enosys)
-int rump___sysimpl_setsockopt(int, int, int, const void *, unsigned int);
+int rump___sysimpl_setsockopt(int, int, int, const void *, socklen_t);
int
-rump___sysimpl_setsockopt(int s, int level, int name, const void * val, unsigned int valsize)
+rump___sysimpl_setsockopt(int s, int level, int name, const void * val, socklen_t valsize)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -1216,9 +1216,9 @@
}
rsys_alias(sys_listen,rump_enosys)
-int rump___sysimpl_getsockopt(int, int, int, void *, unsigned int *);
+int rump___sysimpl_getsockopt(int, int, int, void *, socklen_t *);
int
-rump___sysimpl_getsockopt(int s, int level, int name, void * val, unsigned int * avalsize)
+rump___sysimpl_getsockopt(int s, int level, int name, void * val, socklen_t * avalsize)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -1462,9 +1462,9 @@
}
rsys_alias(sys_mkfifo,rump_enosys)
-ssize_t rump___sysimpl_sendto(int, const void *, size_t, int, const struct sockaddr *, unsigned int);
+ssize_t rump___sysimpl_sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t);
ssize_t
-rump___sysimpl_sendto(int s, const void * buf, size_t len, int flags, const struct sockaddr * to, unsigned int tolen)
+rump___sysimpl_sendto(int s, const void * buf, size_t len, int flags, const struct sockaddr * to, socklen_t tolen)
{
register_t retval[2] = {0, 0};
int error = 0;
@@ -4022,6 +4022,105 @@
}
rsys_alias(sys___quotactl50,rump_enosys)
+int rump___sysimpl_pipe2(int *, int);
+int
+rump___sysimpl_pipe2(int * fildes, int flags)
+{
+ register_t retval[2] = {0, 0};
+ int error = 0;
+ int rv = -1;
+ struct sys_pipe2_args callarg;
+
+ SPARG(&callarg, fildes) = fildes;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS_pipe2, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_alias(sys_pipe2,rump_enosys)
+
+int rump___sysimpl_dup3(int, int, int);
+int
+rump___sysimpl_dup3(int from, int to, int flags)
+{
+ register_t retval[2] = {0, 0};
+ int error = 0;
+ int rv = -1;
+ struct sys_dup3_args callarg;
+
+ SPARG(&callarg, from) = from;
+ SPARG(&callarg, to) = to;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS_dup3, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_alias(sys_dup3,rump_enosys)
+
+int rump___sysimpl_kqueue1(int);
+int
+rump___sysimpl_kqueue1(int flags)
+{
+ register_t retval[2] = {0, 0};
+ int error = 0;
+ int rv = -1;
+ struct sys_kqueue1_args callarg;
+
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS_kqueue1, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_alias(sys_kqueue1,rump_enosys)
+
+int rump___sysimpl_paccept(int, struct sockaddr *, socklen_t *, const sigset_t *, int);
+int
+rump___sysimpl_paccept(int s, struct sockaddr * name, socklen_t * anamelen, const sigset_t * mask, int flags)
+{
+ register_t retval[2] = {0, 0};
+ int error = 0;
+ int rv = -1;
+ struct sys_paccept_args callarg;
+
+ SPARG(&callarg, s) = s;
+ SPARG(&callarg, name) = name;
+ SPARG(&callarg, anamelen) = anamelen;
+ SPARG(&callarg, mask) = mask;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS_paccept, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_alias(sys_paccept,rump_enosys)
+
int rump_sys_pipe(int *);
int
rump_sys_pipe(int *fd)
@@ -5039,14 +5138,14 @@
(sy_call_t *)sys___fhstat50 }, /* 451 = __fhstat50 */
{ ns(struct sys___quotactl50_args), 0,
(sy_call_t *)sys___quotactl50 }, /* 452 = __quotactl50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 453 = filler */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 454 = filler */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 455 = filler */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 456 = filler */
+ { ns(struct sys_pipe2_args), 0,
+ (sy_call_t *)sys_pipe2 }, /* 453 = pipe2 */
+ { ns(struct sys_dup3_args), 0,
+ (sy_call_t *)sys_dup3 }, /* 454 = dup3 */
+ { ns(struct sys_kqueue1_args), 0,
+ (sy_call_t *)sys_kqueue1 }, /* 455 = kqueue1 */
+ { ns(struct sys_paccept_args), 0,
+ (sy_call_t *)sys_paccept }, /* 456 = paccept */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 457 = filler */
{ 0, 0, SYCALL_NOSYS,
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.241 src/sys/sys/syscall.h:1.242
--- src/sys/sys/syscall.h:1.241 Sun Mar 6 12:08:38 2011
+++ src/sys/sys/syscall.h Sun Jun 26 13:05:55 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.241 2011/03/06 17:08:38 bouyer Exp $ */
+/* $NetBSD: syscall.h,v 1.242 2011/06/26 17:05:55 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD
+ * created from NetBSD: syscalls.master,v 1.249 2011/06/26 17:05:24 christos Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -97,16 +97,16 @@
/* syscall: "sendmsg" ret: "ssize_t" args: "int" "const struct msghdr *" "int" */
#define SYS_sendmsg 28
-/* syscall: "recvfrom" ret: "ssize_t" args: "int" "void *" "size_t" "int" "struct sockaddr *" "unsigned int *" */
+/* syscall: "recvfrom" ret: "ssize_t" args: "int" "void *" "size_t" "int" "struct sockaddr *" "socklen_t *" */
#define SYS_recvfrom 29
-/* syscall: "accept" ret: "int" args: "int" "struct sockaddr *" "unsigned int *" */
+/* syscall: "accept" ret: "int" args: "int" "struct sockaddr *" "socklen_t *" */
#define SYS_accept 30
-/* syscall: "getpeername" ret: "int" args: "int" "struct sockaddr *" "unsigned int *" */
+/* syscall: "getpeername" ret: "int" args: "int" "struct sockaddr *" "socklen_t *" */
#define SYS_getpeername 31
-/* syscall: "getsockname" ret: "int" args: "int" "struct sockaddr *" "unsigned int *" */
+/* syscall: "getsockname" ret: "int" args: "int" "struct sockaddr *" "socklen_t *" */
#define SYS_getsockname 32
/* syscall: "access" ret: "int" args: "const char *" "int" */
@@ -290,10 +290,10 @@
/* syscall: "compat_30_socket" ret: "int" args: "int" "int" "int" */
#define SYS_compat_30_socket 97
-/* syscall: "connect" ret: "int" args: "int" "const struct sockaddr *" "unsigned int" */
+/* syscall: "connect" ret: "int" args: "int" "const struct sockaddr *" "socklen_t" */
#define SYS_connect 98
-/* syscall: "compat_43_oaccept" ret: "int" args: "int" "void *" "int *" */
+/* syscall: "compat_43_oaccept" ret: "int" args: "int" "void *" "socklen_t *" */
#define SYS_compat_43_oaccept 99
/* syscall: "getpriority" ret: "int" args: "int" "id_t" */
@@ -308,10 +308,10 @@
/* syscall: "compat_13_sigreturn13" ret: "int" args: "struct sigcontext13 *" */
#define SYS_compat_13_sigreturn13 103
-/* syscall: "bind" ret: "int" args: "int" "const struct sockaddr *" "unsigned int" */
+/* syscall: "bind" ret: "int" args: "int" "const struct sockaddr *" "socklen_t" */
#define SYS_bind 104
-/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "const void *" "unsigned int" */
+/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "const void *" "socklen_t" */
#define SYS_setsockopt 105
/* syscall: "listen" ret: "int" args: "int" "int" */
@@ -346,7 +346,7 @@
/* syscall: "compat_50_getrusage" ret: "int" args: "int" "struct rusage50 *" */
#define SYS_compat_50_getrusage 117
-/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "unsigned int *" */
+/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "socklen_t *" */
#define SYS_getsockopt 118
/* 119 is obsolete resuba */
@@ -365,7 +365,7 @@
/* syscall: "fchmod" ret: "int" args: "int" "mode_t" */
#define SYS_fchmod 124
-/* syscall: "compat_43_orecvfrom" ret: "int" args: "int" "void *" "size_t" "int" "void *" "int *" */
+/* syscall: "compat_43_orecvfrom" ret: "int" args: "int" "void *" "size_t" "int" "void *" "socklen_t *" */
#define SYS_compat_43_orecvfrom 125
/* syscall: "setreuid" ret: "int" args: "uid_t" "uid_t" */
@@ -389,7 +389,7 @@
/* syscall: "mkfifo" ret: "int" args: "const char *" "mode_t" */
#define SYS_mkfifo 132
-/* syscall: "sendto" ret: "ssize_t" args: "int" "const void *" "size_t" "int" "const struct sockaddr *" "unsigned int" */
+/* syscall: "sendto" ret: "ssize_t" args: "int" "const void *" "size_t" "int" "const struct sockaddr *" "socklen_t" */
#define SYS_sendto 133
/* syscall: "shutdown" ret: "int" args: "int" "int" */
@@ -411,7 +411,7 @@
/* syscall: "compat_50_adjtime" ret: "int" args: "const struct timeval50 *" "struct timeval50 *" */
#define SYS_compat_50_adjtime 140
-/* syscall: "compat_43_ogetpeername" ret: "int" args: "int" "void *" "int *" */
+/* syscall: "compat_43_ogetpeername" ret: "int" args: "int" "void *" "socklen_t *" */
#define SYS_compat_43_ogetpeername 141
/* syscall: "compat_43_ogethostid" ret: "int32_t" args: */
@@ -438,7 +438,7 @@
/* syscall: "compat_43_oquota" ret: "int" args: */
#define SYS_compat_43_oquota 149
-/* syscall: "compat_43_ogetsockname" ret: "int" args: "int" "void *" "int *" */
+/* syscall: "compat_43_ogetsockname" ret: "int" args: "int" "void *" "socklen_t *" */
#define SYS_compat_43_ogetsockname 150
/* syscall: "nfssvc" ret: "int" args: "int" "void *" */
@@ -1282,6 +1282,18 @@
/* syscall: "__quotactl50" ret: "int" args: "const char *" "struct plistref *" */
#define SYS___quotactl50 452
-#define SYS_MAXSYSCALL 453
+/* syscall: "pipe2" ret: "int" args: "int *" "int" */
+#define SYS_pipe2 453
+
+/* syscall: "dup3" ret: "int" args: "int" "int" "int" */
+#define SYS_dup3 454
+
+/* syscall: "kqueue1" ret: "int" args: "int" */
+#define SYS_kqueue1 455
+
+/* syscall: "paccept" ret: "int" args: "int" "struct sockaddr *" "socklen_t *" "const sigset_t *" "int" */
+#define SYS_paccept 456
+
+#define SYS_MAXSYSCALL 457
#define SYS_NSYSENT 512
#endif /* _SYS_SYSCALL_H_ */
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.224 src/sys/sys/syscallargs.h:1.225
--- src/sys/sys/syscallargs.h:1.224 Sun Mar 6 12:08:38 2011
+++ src/sys/sys/syscallargs.h Sun Jun 26 13:05:55 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.224 2011/03/06 17:08:38 bouyer Exp $ */
+/* $NetBSD: syscallargs.h,v 1.225 2011/06/26 17:05:55 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD
+ * created from NetBSD: syscalls.master,v 1.249 2011/06/26 17:05:24 christos Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -12,6 +12,7 @@
#include <sys/mount.h>
#include <sys/sched.h>
+#include <sys/socket.h>
#define SYS_MAXSYSARGS 8
@@ -191,28 +192,28 @@
syscallarg(size_t) len;
syscallarg(int) flags;
syscallarg(struct sockaddr *) from;
- syscallarg(unsigned int *) fromlenaddr;
+ syscallarg(socklen_t *) fromlenaddr;
};
check_syscall_args(sys_recvfrom)
struct sys_accept_args {
syscallarg(int) s;
syscallarg(struct sockaddr *) name;
- syscallarg(unsigned int *) anamelen;
+ syscallarg(socklen_t *) anamelen;
};
check_syscall_args(sys_accept)
struct sys_getpeername_args {
syscallarg(int) fdes;
syscallarg(struct sockaddr *) asa;
- syscallarg(unsigned int *) alen;
+ syscallarg(socklen_t *) alen;
};
check_syscall_args(sys_getpeername)
struct sys_getsockname_args {
syscallarg(int) fdes;
syscallarg(struct sockaddr *) asa;
- syscallarg(unsigned int *) alen;
+ syscallarg(socklen_t *) alen;
};
check_syscall_args(sys_getsockname)
@@ -519,14 +520,14 @@
struct sys_connect_args {
syscallarg(int) s;
syscallarg(const struct sockaddr *) name;
- syscallarg(unsigned int) namelen;
+ syscallarg(socklen_t) namelen;
};
check_syscall_args(sys_connect)
struct compat_43_sys_accept_args {
syscallarg(int) s;
syscallarg(void *) name;
- syscallarg(int *) anamelen;
+ syscallarg(socklen_t *) anamelen;
};
check_syscall_args(compat_43_sys_accept)
@@ -560,7 +561,7 @@
struct sys_bind_args {
syscallarg(int) s;
syscallarg(const struct sockaddr *) name;
- syscallarg(unsigned int) namelen;
+ syscallarg(socklen_t) namelen;
};
check_syscall_args(sys_bind)
@@ -569,7 +570,7 @@
syscallarg(int) level;
syscallarg(int) name;
syscallarg(const void *) val;
- syscallarg(unsigned int) valsize;
+ syscallarg(socklen_t) valsize;
};
check_syscall_args(sys_setsockopt)
@@ -638,7 +639,7 @@
syscallarg(int) level;
syscallarg(int) name;
syscallarg(void *) val;
- syscallarg(unsigned int *) avalsize;
+ syscallarg(socklen_t *) avalsize;
};
check_syscall_args(sys_getsockopt)
@@ -681,7 +682,7 @@
syscallarg(size_t) len;
syscallarg(int) flags;
syscallarg(void *) from;
- syscallarg(int *) fromlenaddr;
+ syscallarg(socklen_t *) fromlenaddr;
};
check_syscall_args(compat_43_sys_recvfrom)
@@ -733,7 +734,7 @@
syscallarg(size_t) len;
syscallarg(int) flags;
syscallarg(const struct sockaddr *) to;
- syscallarg(unsigned int) tolen;
+ syscallarg(socklen_t) tolen;
};
check_syscall_args(sys_sendto)
@@ -777,7 +778,7 @@
struct compat_43_sys_getpeername_args {
syscallarg(int) fdes;
syscallarg(void *) asa;
- syscallarg(int *) alen;
+ syscallarg(socklen_t *) alen;
};
check_syscall_args(compat_43_sys_getpeername)
@@ -815,7 +816,7 @@
struct compat_43_sys_getsockname_args {
syscallarg(int) fdec;
syscallarg(void *) asa;
- syscallarg(int *) alen;
+ syscallarg(socklen_t *) alen;
};
check_syscall_args(compat_43_sys_getsockname)
@@ -2537,6 +2538,33 @@
};
check_syscall_args(sys___quotactl50)
+struct sys_pipe2_args {
+ syscallarg(int *) fildes;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys_pipe2)
+
+struct sys_dup3_args {
+ syscallarg(int) from;
+ syscallarg(int) to;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys_dup3)
+
+struct sys_kqueue1_args {
+ syscallarg(int) flags;
+};
+check_syscall_args(sys_kqueue1)
+
+struct sys_paccept_args {
+ syscallarg(int) s;
+ syscallarg(struct sockaddr *) name;
+ syscallarg(socklen_t *) anamelen;
+ syscallarg(const sigset_t *) mask;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys_paccept)
+
/*
* System call prototypes.
*/
@@ -3379,4 +3407,12 @@
int sys___quotactl50(struct lwp *, const struct sys___quotactl50_args *, register_t *);
+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 sys_kqueue1(struct lwp *, const struct sys_kqueue1_args *, register_t *);
+
+int sys_paccept(struct lwp *, const struct sys_paccept_args *, register_t *);
+
#endif /* _SYS_SYSCALLARGS_H_ */
