[src/trunk]: src/sys regen

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a28af99611e
branches:  trunk
changeset: 789702:1a28af99611e
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Sep 03 21:30:43 2013 +0000

description:
regen

diffstat:

 sys/kern/init_sysent.c                    |     4 +-
 sys/kern/syscalls.c                       |     4 +-
 sys/rump/include/rump/rump_syscalls.h     |     2 +-
 sys/rump/librump/rumpkern/rump_syscalls.c |  1214 ++++++++++++++++------------
 sys/sys/syscall.h                         |     2 +-
 sys/sys/syscallargs.h                     |     2 +-
 6 files changed, 704 insertions(+), 524 deletions(-)

diffs (truncated from 3162 to 300 lines):

diff -r 361ca9c9c786 -r 1a28af99611e sys/kern/init_sysent.c
--- a/sys/kern/init_sysent.c    Tue Sep 03 21:28:24 2013 +0000
+++ b/sys/kern/init_sysent.c    Tue Sep 03 21:30:43 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysent.c,v 1.272 2013/08/30 11:10:35 pooka Exp $ */
+/* $NetBSD: init_sysent.c,v 1.273 2013/09/03 21:30:43 pooka Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.272 2013/08/30 11:10:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.273 2013/09/03 21:30:43 pooka Exp $");
 
 #include "opt_modular.h"
 #include "opt_ntp.h"
diff -r 361ca9c9c786 -r 1a28af99611e sys/kern/syscalls.c
--- a/sys/kern/syscalls.c       Tue Sep 03 21:28:24 2013 +0000
+++ b/sys/kern/syscalls.c       Tue Sep 03 21:30:43 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: syscalls.c,v 1.263 2013/08/30 11:10:35 pooka Exp $ */
+/* $NetBSD: syscalls.c,v 1.264 2013/09/03 21:30:43 pooka Exp $ */
 
 /*
  * System call names.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.263 2013/08/30 11:10:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.264 2013/09/03 21:30:43 pooka Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_modular.h"
diff -r 361ca9c9c786 -r 1a28af99611e sys/rump/include/rump/rump_syscalls.h
--- a/sys/rump/include/rump/rump_syscalls.h     Tue Sep 03 21:28:24 2013 +0000
+++ b/sys/rump/include/rump/rump_syscalls.h     Tue Sep 03 21:30:43 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.64 2013/08/30 10:34:39 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.65 2013/09/03 21:30:43 pooka Exp $ */
 
 /*
  * System call protos in rump namespace.
diff -r 361ca9c9c786 -r 1a28af99611e sys/rump/librump/rumpkern/rump_syscalls.c
--- a/sys/rump/librump/rumpkern/rump_syscalls.c Tue Sep 03 21:28:24 2013 +0000
+++ b/sys/rump/librump/rumpkern/rump_syscalls.c Tue Sep 03 21:30:43 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.c,v 1.89 2013/08/30 10:34:39 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.90 2013/09/03 21:30:43 pooka Exp $ */
 
 /*
  * System call vector and marshalling for rump.
@@ -15,7 +15,7 @@
 
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.89 2013/08/30 10:34:39 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.90 2013/09/03 21:30:43 pooka Exp $");
 
 #include <sys/fstypes.h>
 #include <sys/proc.h>
@@ -34,7 +34,7 @@
 #define rsys_syscall(num, data, dlen, retval)  \
     rumpclient_syscall(num, data, dlen, retval)
 #define rsys_seterrno(error) errno = error
-#define rsys_alias(a,b)
+#define rsys_define(nam)
 #else
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
@@ -44,30 +44,21 @@
 #include <rump/rumpuser.h>
 #include "rump_private.h"
 
-static int
-rsys_syscall(int num, void *data, size_t dlen, register_t *retval)
-{
-       struct proc *p;
-       struct emul *e;
-       struct sysent *callp;
-       int rv;
-
-       rump_schedule();
-       p = curproc;
-       e = p->p_emul;
-#ifndef __HAVE_MINIMAL_EMUL
-       KASSERT(num > 0 && num < e->e_nsysent);
-#endif
-       callp = e->e_sysent + num;
-
-       rv = sy_call(callp, curlwp, data, retval);
-       rump_unschedule();
-
-       return rv;
-}
+#define rsys_syscall(num, data, dlen, retval)  \
+    rump_syscall(num, data, dlen, retval)
 
 #define rsys_seterrno(error) rumpuser_seterrno(error)
-#define rsys_alias(a,b) __weak_alias(a,b);
+#define rsys_define(nam) \
+       int nam(struct lwp *, const void *, register_t *);      \
+       __weak_alias(nam,rump_enosys);
+#endif
+
+#ifdef RUMP_KERNEL_IS_LIBC
+#define rsys_aliases(what,where) \
+       __strong_alias(what,where); \
+       __strong_alias(_##what,where);
+#else
+#define rsys_aliases(a,b)
 #endif
 
 #if    BYTE_ORDER == BIG_ENDIAN
@@ -86,6 +77,8 @@
 }
 #endif
 
+void rumpns_sys_nomodule(void);
+
 ssize_t rump___sysimpl_read(int, void *, size_t);
 ssize_t
 rump___sysimpl_read(int fd, void * buf, size_t nbyte)
@@ -109,7 +102,8 @@
        }
        return rv;
 }
-rsys_alias(sys_read,rump_enosys)
+rsys_define(rumpns_sys_read);
+rsys_aliases(read,rump___sysimpl_read);
 
 ssize_t rump___sysimpl_write(int, const void *, size_t);
 ssize_t
@@ -134,7 +128,8 @@
        }
        return rv;
 }
-rsys_alias(sys_write,rump_enosys)
+rsys_define(rumpns_sys_write);
+rsys_aliases(write,rump___sysimpl_write);
 
 int rump___sysimpl_open(const char *, int, mode_t);
 int
@@ -159,7 +154,8 @@
        }
        return rv;
 }
-rsys_alias(sys_open,rump_enosys)
+rsys_define(rumpns_sys_open);
+rsys_aliases(open,rump___sysimpl_open);
 
 int rump___sysimpl_close(int);
 int
@@ -182,7 +178,8 @@
        }
        return rv;
 }
-rsys_alias(sys_close,rump_enosys)
+rsys_define(rumpns_sys_close);
+rsys_aliases(close,rump___sysimpl_close);
 
 int rump___sysimpl_link(const char *, const char *);
 int
@@ -206,7 +203,8 @@
        }
        return rv;
 }
-rsys_alias(sys_link,rump_enosys)
+rsys_define(rumpns_sys_link);
+rsys_aliases(link,rump___sysimpl_link);
 
 int rump___sysimpl_unlink(const char *);
 int
@@ -229,7 +227,8 @@
        }
        return rv;
 }
-rsys_alias(sys_unlink,rump_enosys)
+rsys_define(rumpns_sys_unlink);
+rsys_aliases(unlink,rump___sysimpl_unlink);
 
 int rump___sysimpl_chdir(const char *);
 int
@@ -252,7 +251,8 @@
        }
        return rv;
 }
-rsys_alias(sys_chdir,rump_enosys)
+rsys_define(rumpns_sys_chdir);
+rsys_aliases(chdir,rump___sysimpl_chdir);
 
 int rump___sysimpl_fchdir(int);
 int
@@ -275,7 +275,8 @@
        }
        return rv;
 }
-rsys_alias(sys_fchdir,rump_enosys)
+rsys_define(rumpns_sys_fchdir);
+rsys_aliases(fchdir,rump___sysimpl_fchdir);
 
 int rump___sysimpl_mknod(const char *, mode_t, uint32_t);
 int
@@ -300,7 +301,8 @@
        }
        return rv;
 }
-rsys_alias(compat_50_sys_mknod,rump_enosys)
+rsys_define(rumpns_compat_50_sys_mknod);
+rsys_aliases(compat_50_mknod,rump___sysimpl_mknod);
 
 int rump___sysimpl_chmod(const char *, mode_t);
 int
@@ -324,7 +326,8 @@
        }
        return rv;
 }
-rsys_alias(sys_chmod,rump_enosys)
+rsys_define(rumpns_sys_chmod);
+rsys_aliases(chmod,rump___sysimpl_chmod);
 
 int rump___sysimpl_chown(const char *, uid_t, gid_t);
 int
@@ -349,7 +352,8 @@
        }
        return rv;
 }
-rsys_alias(sys_chown,rump_enosys)
+rsys_define(rumpns_sys_chown);
+rsys_aliases(chown,rump___sysimpl_chown);
 
 pid_t rump___sysimpl_getpid(void);
 pid_t
@@ -365,7 +369,8 @@
                rv = *retval;
        return rv;
 }
-rsys_alias(sys_getpid_with_ppid,rump_enosys)
+rsys_define(rumpns_sys_getpid_with_ppid);
+rsys_aliases(getpid,rump___sysimpl_getpid);
 
 int rump___sysimpl_unmount(const char *, int);
 int
@@ -389,7 +394,8 @@
        }
        return rv;
 }
-rsys_alias(sys_unmount,rump_enosys)
+rsys_define(rumpns_sys_unmount);
+rsys_aliases(unmount,rump___sysimpl_unmount);
 
 int rump___sysimpl_setuid(uid_t);
 int
@@ -412,7 +418,8 @@
        }
        return rv;
 }
-rsys_alias(sys_setuid,rump_enosys)
+rsys_define(rumpns_sys_setuid);
+rsys_aliases(setuid,rump___sysimpl_setuid);
 
 uid_t rump___sysimpl_getuid(void);
 uid_t
@@ -428,7 +435,8 @@
                rv = *retval;
        return rv;
 }
-rsys_alias(sys_getuid_with_euid,rump_enosys)
+rsys_define(rumpns_sys_getuid_with_euid);
+rsys_aliases(getuid,rump___sysimpl_getuid);
 
 uid_t rump___sysimpl_geteuid(void);
 uid_t
@@ -444,7 +452,8 @@
                rv = *retval;
        return rv;
 }
-rsys_alias(sys_geteuid,rump_enosys)
+rsys_define(rumpns_sys_geteuid);
+rsys_aliases(geteuid,rump___sysimpl_geteuid);
 
 ssize_t rump___sysimpl_recvmsg(int, struct msghdr *, int);
 ssize_t
@@ -469,7 +478,8 @@
        }
        return rv;
 }
-rsys_alias(sys_recvmsg,rump_enosys)
+rsys_define(rumpns_sys_recvmsg);
+rsys_aliases(recvmsg,rump___sysimpl_recvmsg);
 
 ssize_t rump___sysimpl_sendmsg(int, const struct msghdr *, int);
 ssize_t
@@ -494,7 +504,8 @@
        }
        return rv;
 }
-rsys_alias(sys_sendmsg,rump_enosys)