Module Name: src
Committed By: pooka
Date: Wed Dec 11 09:45:02 UTC 2013
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:
reregengen
To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.270 -r1.271 src/sys/kern/syscalls.c
cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.96 -r1.97 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.266 -r1.267 src/sys/sys/syscall.h
cvs rdiff -u -r1.249 -r1.250 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.279 src/sys/kern/init_sysent.c:1.280
--- src/sys/kern/init_sysent.c:1.279 Mon Dec 9 21:13:22 2013
+++ src/sys/kern/init_sysent.c Wed Dec 11 09:45:02 2013
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.279 2013/12/09 21:13:22 pooka Exp $ */
+/* $NetBSD: init_sysent.c,v 1.280 2013/12/11 09:45:02 pooka Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.279 2013/12/09 21:13:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.280 2013/12/11 09:45:02 pooka Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.270 src/sys/kern/syscalls.c:1.271
--- src/sys/kern/syscalls.c:1.270 Mon Dec 9 21:13:22 2013
+++ src/sys/kern/syscalls.c Wed Dec 11 09:45:02 2013
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.270 2013/12/09 21:13:22 pooka Exp $ */
+/* $NetBSD: syscalls.c,v 1.271 2013/12/11 09:45:02 pooka Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.270 2013/12/09 21:13:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.271 2013/12/11 09:45:02 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.71 src/sys/rump/include/rump/rump_syscalls.h:1.72
--- src/sys/rump/include/rump/rump_syscalls.h:1.71 Mon Dec 9 21:13:22 2013
+++ src/sys/rump/include/rump/rump_syscalls.h Wed Dec 11 09:45:02 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.71 2013/12/09 21:13:22 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.72 2013/12/11 09:45:02 pooka Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -572,6 +572,10 @@
#define RUMP_SYS_RENAME_EXTATTR_SET_FD rump___sysimpl_extattr_set_fd
#endif
+#ifndef RUMP_SYS_RENAME_UTRACE
+#define RUMP_SYS_RENAME_UTRACE rump___sysimpl_utrace
+#endif
+
#ifndef RUMP_SYS_RENAME_UMASK
#define RUMP_SYS_RENAME_UMASK rump___sysimpl_umask
#endif
@@ -838,6 +842,7 @@ int rump_sys___getcwd(char *, size_t) __
int rump_sys_fchroot(int) __RENAME(RUMP_SYS_RENAME_FCHROOT);
int rump_sys_lchflags(const char *, u_long) __RENAME(RUMP_SYS_RENAME_LCHFLAGS);
int rump_sys_issetugid(void) __RENAME(RUMP_SYS_RENAME_ISSETUGID);
+int rump_sys_utrace(const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_UTRACE);
int rump_sys_kqueue(void) __RENAME(RUMP_SYS_RENAME_KQUEUE);
int rump_sys_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *) __RENAME(RUMP_SYS_RENAME_KEVENT);
int rump_sys_fsync_range(int, int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_FSYNC_RANGE);
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.96 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.97
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.96 Mon Dec 9 21:13:22 2013
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Wed Dec 11 09:45:02 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.96 2013/12/09 21:13:22 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.97 2013/12/11 09:45:02 pooka Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.96 2013/12/09 21:13:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.97 2013/12/11 09:45:02 pooka Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -2867,6 +2867,33 @@ rump___sysimpl_issetugid(void )
rsys_define(rumpns_sys_issetugid);
rsys_aliases(issetugid,rump___sysimpl_issetugid);
+int rump___sysimpl_utrace(const char *, void *, size_t);
+int
+rump___sysimpl_utrace(const char * label, void * addr, size_t len)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_utrace_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, label) = label;
+ SPARG(&callarg, addr) = addr;
+ SPARG(&callarg, len) = len;
+
+ error = rsys_syscall(SYS_utrace, &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_define(rumpns_sys_utrace);
+rsys_aliases(utrace,rump___sysimpl_utrace);
+
int rump___sysimpl_kqueue(void);
int
rump___sysimpl_kqueue(void )
@@ -5717,8 +5744,8 @@ struct sysent rump_sysent[] = {
(sy_call_t *)rumpns_sys_lchflags }, /* 304 = lchflags */
{ 0, 0, 0,
(sy_call_t *)rumpns_sys_issetugid },/* 305 = issetugid */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 306 = utrace */
+ { ns(struct sys_utrace_args), 0,
+ (sy_call_t *)rumpns_sys_utrace }, /* 306 = utrace */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 307 = getcontext */
{ 0, 0, SYCALL_NOSYS,
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.266 src/sys/sys/syscall.h:1.267
--- src/sys/sys/syscall.h:1.266 Mon Dec 9 21:13:21 2013
+++ src/sys/sys/syscall.h Wed Dec 11 09:45:01 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.266 2013/12/09 21:13:21 pooka Exp $ */
+/* $NetBSD: syscall.h,v 1.267 2013/12/11 09:45:01 pooka Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
*/
#ifndef _SYS_SYSCALL_H_
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.249 src/sys/sys/syscallargs.h:1.250
--- src/sys/sys/syscallargs.h:1.249 Mon Dec 9 21:13:21 2013
+++ src/sys/sys/syscallargs.h Wed Dec 11 09:45:01 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.249 2013/12/09 21:13:21 pooka Exp $ */
+/* $NetBSD: syscallargs.h,v 1.250 2013/12/11 09:45:01 pooka Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -1965,14 +1965,12 @@ struct sys_lchflags_args {
};
check_syscall_args(sys_lchflags)
-#ifndef RUMP_CLIENT
struct sys_utrace_args {
syscallarg(const char *) label;
syscallarg(void *) addr;
syscallarg(size_t) len;
};
check_syscall_args(sys_utrace)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct sys_getcontext_args {
