Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat/linux/arch/alpha Regen - modify to use linux_* wr...



details:   https://anonhg.NetBSD.org/src/rev/f6bd9527d618
branches:  trunk
changeset: 512050:f6bd9527d618
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Jul 04 10:26:28 2001 +0000

description:
Regen - modify to use linux_* wrappers for syscalls passing/fetching sockaddr

diffstat:

 sys/compat/linux/arch/alpha/linux_syscall.h     |  14 ++--
 sys/compat/linux/arch/alpha/linux_syscallargs.h |  78 ++++++++++++++++++++----
 sys/compat/linux/arch/alpha/linux_syscalls.c    |   4 +-
 sys/compat/linux/arch/alpha/linux_sysent.c      |  36 +++++-----
 4 files changed, 91 insertions(+), 41 deletions(-)

diffs (truncated from 307 to 300 lines):

diff -r 20650919e377 -r f6bd9527d618 sys/compat/linux/arch/alpha/linux_syscall.h
--- a/sys/compat/linux/arch/alpha/linux_syscall.h       Wed Jul 04 10:25:32 2001 +0000
+++ b/sys/compat/linux/arch/alpha/linux_syscall.h       Wed Jul 04 10:26:28 2001 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.38 2001/05/30 11:37:25 mrg Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.39 2001/07/04 10:26:28 jdolecek Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.33 2001/03/30 17:59:46 jdolecek Exp 
+ * created from        NetBSD: syscalls.master,v 1.35 2001/07/04 10:25:32 jdolecek Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -175,10 +175,10 @@
 /* syscall: "socket" ret: "int" args: "int" "int" "int" */
 #define        LINUX_SYS_socket        97
 
-/* syscall: "connect" ret: "int" args: "int" "const struct sockaddr *" "unsigned int" */
+/* syscall: "connect" ret: "int" args: "int" "const struct osockaddr *" "unsigned int" */
 #define        LINUX_SYS_connect       98
 
-/* syscall: "accept" ret: "int" args: "int" "caddr_t" "int *" */
+/* syscall: "accept" ret: "int" args: "int" "struct osockaddr *" "int *" */
 #define        LINUX_SYS_accept        99
 
 /* syscall: "getpriority" ret: "int" args: "int" "int" */
@@ -193,7 +193,7 @@
 /* syscall: "sigreturn" ret: "int" args: "struct linux_sigframe *" */
 #define        LINUX_SYS_sigreturn     103
 
-/* syscall: "bind" ret: "int" args: "int" "const struct sockaddr *" "unsigned int" */
+/* syscall: "bind" ret: "int" args: "int" "const struct osockaddr *" "unsigned int" */
 #define        LINUX_SYS_bind  104
 
 /* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "void *" "int" */
@@ -229,7 +229,7 @@
 /* syscall: "fchmod" ret: "int" args: "int" "mode_t" */
 #define        LINUX_SYS_fchmod        124
 
-/* syscall: "recvfrom" ret: "int" args: "int" "void *" "int" "int" "struct sockaddr *" "int *" */
+/* syscall: "recvfrom" ret: "int" args: "int" "void *" "int" "int" "struct osockaddr *" "int *" */
 #define        LINUX_SYS_recvfrom      125
 
 /* syscall: "setreuid" ret: "int" args: "uid_t" "uid_t" */
@@ -253,7 +253,7 @@
 /* syscall: "setgid" ret: "int" args: "gid_t" */
 #define        LINUX_SYS_setgid        132
 
-/* syscall: "sendto" ret: "int" args: "int" "void *" "int" "int" "struct sockaddr *" "int" */
+/* syscall: "sendto" ret: "int" args: "int" "void *" "int" "int" "struct osockaddr *" "int" */
 #define        LINUX_SYS_sendto        133
 
 /* syscall: "shutdown" ret: "int" args: "int" "int" */
diff -r 20650919e377 -r f6bd9527d618 sys/compat/linux/arch/alpha/linux_syscallargs.h
--- a/sys/compat/linux/arch/alpha/linux_syscallargs.h   Wed Jul 04 10:25:32 2001 +0000
+++ b/sys/compat/linux/arch/alpha/linux_syscallargs.h   Wed Jul 04 10:26:28 2001 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.38 2001/05/30 11:37:25 mrg Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.39 2001/07/04 10:26:28 jdolecek Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.33 2001/03/30 17:59:46 jdolecek Exp 
+ * created from        NetBSD: syscalls.master,v 1.35 2001/07/04 10:25:32 jdolecek Exp 
  */
 
 #ifndef _LINUX_SYS__SYSCALLARGS_H_
@@ -173,14 +173,40 @@
 
 struct linux_sys_connect_args {
        syscallarg(int) s;
-       syscallarg(const struct sockaddr *) name;
+       syscallarg(const struct osockaddr *) name;
        syscallarg(unsigned int) namelen;
 };
 
+struct linux_sys_accept_args {
+       syscallarg(int) s;
+       syscallarg(struct osockaddr *) name;
+       syscallarg(int *) anamelen;
+};
+
+struct linux_sys_send_args {
+       syscallarg(int) s;
+       syscallarg(caddr_t) buf;
+       syscallarg(int) len;
+       syscallarg(int) flags;
+};
+
+struct linux_sys_recv_args {
+       syscallarg(int) s;
+       syscallarg(caddr_t) buf;
+       syscallarg(int) len;
+       syscallarg(int) flags;
+};
+
 struct linux_sys_sigreturn_args {
        syscallarg(struct linux_sigframe *) sfp;
 };
 
+struct linux_sys_bind_args {
+       syscallarg(int) s;
+       syscallarg(const struct osockaddr *) name;
+       syscallarg(unsigned int) namelen;
+};
+
 struct linux_sys_setsockopt_args {
        syscallarg(int) s;
        syscallarg(int) level;
@@ -195,6 +221,18 @@
        syscallarg(int) mask;
 };
 
+struct linux_sys_recvmsg_args {
+       syscallarg(int) s;
+       syscallarg(struct msghdr *) msg;
+       syscallarg(int) flags;
+};
+
+struct linux_sys_sendmsg_args {
+       syscallarg(int) s;
+       syscallarg(const struct msghdr *) msg;
+       syscallarg(int) flags;
+};
+
 struct osf1_sys_gettimeofday_args {
        syscallarg(struct osf1_timeval *) tv;
        syscallarg(struct osf1_timezone *) tzp;
@@ -223,8 +261,8 @@
        syscallarg(void *) buf;
        syscallarg(int) len;
        syscallarg(int) flags;
-       syscallarg(struct sockaddr *) from;
-       syscallarg(int *) fromlen;
+       syscallarg(struct osockaddr *) from;
+       syscallarg(int *) fromlenaddr;
 };
 
 struct linux_sys_rename_args {
@@ -242,7 +280,7 @@
        syscallarg(void *) msg;
        syscallarg(int) len;
        syscallarg(int) flags;
-       syscallarg(struct sockaddr *) to;
+       syscallarg(struct osockaddr *) to;
        syscallarg(int) tolen;
 };
 
@@ -267,6 +305,18 @@
        syscallarg(const struct osf1_timeval *) tptr;
 };
 
+struct linux_sys_getpeername_args {
+       syscallarg(int) fdes;
+       syscallarg(caddr_t) asa;
+       syscallarg(int *) alen;
+};
+
+struct linux_sys_getsockname_args {
+       syscallarg(int) fdec;
+       syscallarg(caddr_t) asa;
+       syscallarg(int *) alen;
+};
+
 struct linux_sys_sigaction_args {
        syscallarg(int) signum;
        syscallarg(const struct linux_old_sigaction *) nsa;
@@ -575,18 +625,18 @@
 int    sys_setpriority(struct proc *, void *, register_t *);
 int    linux_sys_socket(struct proc *, void *, register_t *);
 int    linux_sys_connect(struct proc *, void *, register_t *);
-int    compat_43_sys_accept(struct proc *, void *, register_t *);
+int    linux_sys_accept(struct proc *, void *, register_t *);
 int    sys_getpriority(struct proc *, void *, register_t *);
-int    compat_43_sys_send(struct proc *, void *, register_t *);
-int    compat_43_sys_recv(struct proc *, void *, register_t *);
+int    linux_sys_send(struct proc *, void *, register_t *);
+int    linux_sys_recv(struct proc *, void *, register_t *);
 int    linux_sys_sigreturn(struct proc *, void *, register_t *);
-int    sys_bind(struct proc *, void *, register_t *);
+int    linux_sys_bind(struct proc *, void *, register_t *);
 int    linux_sys_setsockopt(struct proc *, void *, register_t *);
 int    sys_listen(struct proc *, void *, register_t *);
 int    linux_sys_sigsuspend(struct proc *, void *, register_t *);
 int    compat_43_sys_sigstack(struct proc *, void *, register_t *);
-int    sys_recvmsg(struct proc *, void *, register_t *);
-int    sys_sendmsg(struct proc *, void *, register_t *);
+int    linux_sys_recvmsg(struct proc *, void *, register_t *);
+int    linux_sys_sendmsg(struct proc *, void *, register_t *);
 int    osf1_sys_gettimeofday(struct proc *, void *, register_t *);
 int    osf1_sys_getrusage(struct proc *, void *, register_t *);
 int    linux_sys_getsockopt(struct proc *, void *, register_t *);
@@ -609,11 +659,11 @@
 int    linux_sys_mkdir(struct proc *, void *, register_t *);
 int    linux_sys_rmdir(struct proc *, void *, register_t *);
 int    osf1_sys_utimes(struct proc *, void *, register_t *);
-int    compat_43_sys_getpeername(struct proc *, void *, register_t *);
+int    linux_sys_getpeername(struct proc *, void *, register_t *);
 int    compat_43_sys_getrlimit(struct proc *, void *, register_t *);
 int    compat_43_sys_setrlimit(struct proc *, void *, register_t *);
 int    sys_setsid(struct proc *, void *, register_t *);
-int    compat_43_sys_getsockname(struct proc *, void *, register_t *);
+int    linux_sys_getsockname(struct proc *, void *, register_t *);
 int    linux_sys_sigaction(struct proc *, void *, register_t *);
 int    compat_43_sys_getdirentries(struct proc *, void *, register_t *);
 int    osf1_sys_statfs(struct proc *, void *, register_t *);
diff -r 20650919e377 -r f6bd9527d618 sys/compat/linux/arch/alpha/linux_syscalls.c
--- a/sys/compat/linux/arch/alpha/linux_syscalls.c      Wed Jul 04 10:25:32 2001 +0000
+++ b/sys/compat/linux/arch/alpha/linux_syscalls.c      Wed Jul 04 10:26:28 2001 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscalls.c,v 1.39 2001/05/30 11:37:25 mrg Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.40 2001/07/04 10:26:28 jdolecek Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.33 2001/03/30 17:59:46 jdolecek Exp 
+ * created from        NetBSD: syscalls.master,v 1.35 2001/07/04 10:25:32 jdolecek Exp 
  */
 
 #if defined(_KERNEL_OPT)
diff -r 20650919e377 -r f6bd9527d618 sys/compat/linux/arch/alpha/linux_sysent.c
--- a/sys/compat/linux/arch/alpha/linux_sysent.c        Wed Jul 04 10:25:32 2001 +0000
+++ b/sys/compat/linux/arch/alpha/linux_sysent.c        Wed Jul 04 10:26:28 2001 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_sysent.c,v 1.39 2001/05/30 11:37:25 mrg Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.40 2001/07/04 10:26:29 jdolecek Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.33 2001/03/30 17:59:46 jdolecek Exp 
+ * created from        NetBSD: syscalls.master,v 1.35 2001/07/04 10:25:32 jdolecek Exp 
  */
 
 #if defined(_KERNEL_OPT)
@@ -229,18 +229,18 @@
            linux_sys_socket },                 /* 97 = socket */
        { 3, s(struct linux_sys_connect_args), 0,
            linux_sys_connect },                /* 98 = connect */
-       { 3, s(struct compat_43_sys_accept_args), 0,
-           compat_43_sys_accept },             /* 99 = accept */
+       { 3, s(struct linux_sys_accept_args), 0,
+           linux_sys_accept },                 /* 99 = accept */
        { 2, s(struct sys_getpriority_args), 0,
            sys_getpriority },                  /* 100 = getpriority */
-       { 4, s(struct compat_43_sys_send_args), 0,
-           compat_43_sys_send },               /* 101 = send */
-       { 4, s(struct compat_43_sys_recv_args), 0,
-           compat_43_sys_recv },               /* 102 = recv */
+       { 4, s(struct linux_sys_send_args), 0,
+           linux_sys_send },                   /* 101 = send */
+       { 4, s(struct linux_sys_recv_args), 0,
+           linux_sys_recv },                   /* 102 = recv */
        { 1, s(struct linux_sys_sigreturn_args), 0,
            linux_sys_sigreturn },              /* 103 = sigreturn */
-       { 3, s(struct sys_bind_args), 0,
-           sys_bind },                         /* 104 = bind */
+       { 3, s(struct linux_sys_bind_args), 0,
+           linux_sys_bind },                   /* 104 = bind */
        { 5, s(struct linux_sys_setsockopt_args), 0,
            linux_sys_setsockopt },             /* 105 = setsockopt */
        { 2, s(struct sys_listen_args), 0,
@@ -257,10 +257,10 @@
            linux_sys_sigsuspend },             /* 111 = sigsuspend */
        { 2, s(struct compat_43_sys_sigstack_args), 0,
            compat_43_sys_sigstack },           /* 112 = sigstack */
-       { 3, s(struct sys_recvmsg_args), 0,
-           sys_recvmsg },                      /* 113 = recvmsg */
-       { 3, s(struct sys_sendmsg_args), 0,
-           sys_sendmsg },                      /* 114 = sendmsg */
+       { 3, s(struct linux_sys_recvmsg_args), 0,
+           linux_sys_recvmsg },                /* 113 = recvmsg */
+       { 3, s(struct linux_sys_sendmsg_args), 0,
+           linux_sys_sendmsg },                /* 114 = sendmsg */
        { 0, 0, 0,
            linux_sys_nosys },                  /* 115 = unimplemented */
        { 2, s(struct osf1_sys_gettimeofday_args), 0,
@@ -313,8 +313,8 @@
            linux_sys_nosys },                  /* 139 = unimplemented */
        { 0, 0, 0,
            linux_sys_nosys },                  /* 140 = unimplemented */
-       { 3, s(struct compat_43_sys_getpeername_args), 0,
-           compat_43_sys_getpeername },        /* 141 = getpeername */
+       { 3, s(struct linux_sys_getpeername_args), 0,
+           linux_sys_getpeername },            /* 141 = getpeername */
        { 0, 0, 0,
            linux_sys_nosys },                  /* 142 = unimplemented */
        { 0, 0, 0,
@@ -331,8 +331,8 @@
            linux_sys_nosys },                  /* 148 = unimplemented quotactl */
        { 0, 0, 0,
            linux_sys_nosys },                  /* 149 = unimplemented */



Home | Main Index | Thread Index | Old Index