Use the netbsd32 version of anything that takes args.

This commit is contained in:
eeh 2001-08-15 05:18:11 +00:00
parent 16b1f7aae0
commit 950d07bdf7
5 changed files with 89 additions and 83 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_32_syscall.h,v 1.4 2001/07/01 16:55:41 thorpej Exp $ */
/* $NetBSD: svr4_32_syscall.h,v 1.5 2001/08/15 05:18:11 eeh Exp $ */
/*
* System call numbers.
@ -25,8 +25,8 @@
/* syscall: "open" ret: "int" args: "const netbsd32_charp" "int" "int" */
#define SVR4_32_SYS_open 5
/* syscall: "close" ret: "int" args: "int" */
#define SVR4_32_SYS_close 6
/* syscall: "netbsd32_close" ret: "int" args: "int" */
#define SVR4_32_SYS_netbsd32_close 6
/* syscall: "wait" ret: "int" args: "netbsd32_intp" */
#define SVR4_32_SYS_wait 7
@ -64,8 +64,8 @@
/* syscall: "stat" ret: "int" args: "const netbsd32_charp" "svr4_32_statp" */
#define SVR4_32_SYS_stat 18
/* syscall: "lseek" ret: "netbsd32_long" args: "int" "netbsd32_long" "int" */
#define SVR4_32_SYS_lseek 19
/* syscall: "compat_43_netbsd32_olseek" ret: "netbsd32_long" args: "int" "netbsd32_long" "int" */
#define SVR4_32_SYS_compat_43_netbsd32_olseek 19
/* syscall: "getpid" ret: "pid_t" args: */
#define SVR4_32_SYS_getpid 20
@ -254,8 +254,8 @@
/* syscall: "vfork" ret: "int" args: */
#define SVR4_32_SYS_vfork 119
/* syscall: "fchdir" ret: "int" args: "int" */
#define SVR4_32_SYS_fchdir 120
/* syscall: "netbsd32_fchdir" ret: "int" args: "int" */
#define SVR4_32_SYS_netbsd32_fchdir 120
/* syscall: "netbsd32_readv" ret: "int" args: "int" "const netbsd32_iovecp_t" "int" */
#define SVR4_32_SYS_netbsd32_readv 121
@ -449,29 +449,29 @@
/* syscall: "netbsd32_shutdown" ret: "int" args: "int" "int" */
#define SVR4_32_SYS_netbsd32_shutdown 236
/* syscall: "recv" ret: "int" args: "int" "netbsd32_caddr_t" "int" "int" */
#define SVR4_32_SYS_recv 237
/* syscall: "compat_43_netbsd32_orecv" ret: "int" args: "int" "netbsd32_caddr_t" "int" "int" */
#define SVR4_32_SYS_compat_43_netbsd32_orecv 237
/* syscall: "recvfrom" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
#define SVR4_32_SYS_recvfrom 238
/* syscall: "compat_43_netbsd32_orecvfrom" ret: "int" args: "int" "netbsd32_caddr_t" "netbsd32_size_t" "int" "netbsd32_caddr_t" "netbsd32_intp" */
#define SVR4_32_SYS_compat_43_netbsd32_orecvfrom 238
/* syscall: "recvmsg" ret: "netbsd32_ssize_t" args: "int" "netbsd32_msghdrp_t" "int" */
#define SVR4_32_SYS_recvmsg 239
/* syscall: "compat_43_netbsd32_orecvmsg" ret: "int" args: "int" "netbsd32_omsghdrp_t" "int" */
#define SVR4_32_SYS_compat_43_netbsd32_orecvmsg 239
/* syscall: "send" ret: "int" args: "int" "netbsd32_caddr_t" "int" "int" */
#define SVR4_32_SYS_send 240
/* syscall: "compat_43_netbsd32_osend" ret: "int" args: "int" "netbsd32_caddr_t" "int" "int" */
#define SVR4_32_SYS_compat_43_netbsd32_osend 240
/* syscall: "sendmsg" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_msghdrp_t" "int" */
#define SVR4_32_SYS_sendmsg 241
/* syscall: "compat_43_netbsd32_osendmsg" ret: "int" args: "int" "netbsd32_caddr_t" "int" */
#define SVR4_32_SYS_compat_43_netbsd32_osendmsg 241
/* syscall: "netbsd32_sendto" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_voidp" "netbsd32_size_t" "int" "const netbsd32_sockaddrp_t" "int" */
#define SVR4_32_SYS_netbsd32_sendto 242
/* syscall: "getpeername" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
#define SVR4_32_SYS_getpeername 243
/* syscall: "compat_43_netbsd32_ogetpeername" ret: "int" args: "int" "netbsd32_caddr_t" "netbsd32_intp" */
#define SVR4_32_SYS_compat_43_netbsd32_ogetpeername 243
/* syscall: "getsockname" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
#define SVR4_32_SYS_getsockname 244
/* syscall: "compat_43_netbsd32_ogetsockname" ret: "int" args: "int" "netbsd32_caddr_t" "netbsd32_intp" */
#define SVR4_32_SYS_compat_43_netbsd32_ogetsockname 244
/* syscall: "netbsd32_getsockopt" ret: "int" args: "int" "int" "int" "netbsd32_voidp" "netbsd32_intp" */
#define SVR4_32_SYS_netbsd32_getsockopt 245

View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_32_syscallargs.h,v 1.4 2001/07/01 16:55:41 thorpej Exp $ */
/* $NetBSD: svr4_32_syscallargs.h,v 1.5 2001/08/15 05:18:11 eeh Exp $ */
/*
* System call argument lists.
@ -501,7 +501,7 @@ int sys_fork(struct proc *, void *, register_t *);
int netbsd32_read(struct proc *, void *, register_t *);
int netbsd32_write(struct proc *, void *, register_t *);
int svr4_32_sys_open(struct proc *, void *, register_t *);
int sys_close(struct proc *, void *, register_t *);
int netbsd32_close(struct proc *, void *, register_t *);
int svr4_32_sys_wait(struct proc *, void *, register_t *);
int svr4_32_sys_creat(struct proc *, void *, register_t *);
int netbsd32_link(struct proc *, void *, register_t *);
@ -514,7 +514,7 @@ int netbsd32_chmod(struct proc *, void *, register_t *);
int netbsd32___posix_chown(struct proc *, void *, register_t *);
int svr4_32_sys_break(struct proc *, void *, register_t *);
int svr4_32_sys_stat(struct proc *, void *, register_t *);
int compat_43_sys_lseek(struct proc *, void *, register_t *);
int compat_43_netbsd32_olseek(struct proc *, void *, register_t *);
int sys_getpid(struct proc *, void *, register_t *);
int netbsd32_setuid(struct proc *, void *, register_t *);
int sys_getuid_with_euid(struct proc *, void *, register_t *);
@ -583,7 +583,7 @@ int netbsd32_mprotect(struct proc *, void *, register_t *);
int netbsd32_munmap(struct proc *, void *, register_t *);
int svr4_32_sys_fpathconf(struct proc *, void *, register_t *);
int sys_vfork(struct proc *, void *, register_t *);
int sys_fchdir(struct proc *, void *, register_t *);
int netbsd32_fchdir(struct proc *, void *, register_t *);
int netbsd32_readv(struct proc *, void *, register_t *);
int netbsd32_writev(struct proc *, void *, register_t *);
int svr4_32_sys_xstat(struct proc *, void *, register_t *);
@ -648,14 +648,14 @@ int netbsd32_listen(struct proc *, void *, register_t *);
int compat_43_netbsd32_oaccept(struct proc *, void *, register_t *);
int netbsd32_connect(struct proc *, void *, register_t *);
int netbsd32_shutdown(struct proc *, void *, register_t *);
int compat_43_sys_recv(struct proc *, void *, register_t *);
int compat_43_sys_recvfrom(struct proc *, void *, register_t *);
int compat_43_sys_recvmsg(struct proc *, void *, register_t *);
int compat_43_sys_send(struct proc *, void *, register_t *);
int compat_43_sys_sendmsg(struct proc *, void *, register_t *);
int compat_43_netbsd32_orecv(struct proc *, void *, register_t *);
int compat_43_netbsd32_orecvfrom(struct proc *, void *, register_t *);
int compat_43_netbsd32_orecvmsg(struct proc *, void *, register_t *);
int compat_43_netbsd32_osend(struct proc *, void *, register_t *);
int compat_43_netbsd32_osendmsg(struct proc *, void *, register_t *);
int netbsd32_sendto(struct proc *, void *, register_t *);
int compat_43_sys_getpeername(struct proc *, void *, register_t *);
int compat_43_sys_getsockname(struct proc *, void *, register_t *);
int compat_43_netbsd32_ogetpeername(struct proc *, void *, register_t *);
int compat_43_netbsd32_ogetsockname(struct proc *, void *, register_t *);
int netbsd32_getsockopt(struct proc *, void *, register_t *);
int netbsd32_setsockopt(struct proc *, void *, register_t *);
int netbsd32_ntp_gettime(struct proc *, void *, register_t *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_32_syscalls.c,v 1.4 2001/07/01 16:55:41 thorpej Exp $ */
/* $NetBSD: svr4_32_syscalls.c,v 1.5 2001/08/15 05:18:12 eeh Exp $ */
/*
* System call names.
@ -37,7 +37,7 @@ const char *const svr4_32_syscallnames[] = {
"netbsd32_read", /* 3 = netbsd32_read */
"netbsd32_write", /* 4 = netbsd32_write */
"open", /* 5 = open */
"close", /* 6 = close */
"netbsd32_close", /* 6 = netbsd32_close */
"wait", /* 7 = wait */
"creat", /* 8 = creat */
"netbsd32_link", /* 9 = netbsd32_link */
@ -50,7 +50,7 @@ const char *const svr4_32_syscallnames[] = {
"chown", /* 16 = chown */
"break", /* 17 = break */
"stat", /* 18 = stat */
"lseek", /* 19 = lseek */
"compat_43_netbsd32_olseek", /* 19 = compat_43_netbsd32_olseek */
"getpid", /* 20 = getpid */
"#21 (unimplemented old_mount)", /* 21 = unimplemented old_mount */
"#22 (unimplemented System V umount)", /* 22 = unimplemented System V umount */
@ -163,7 +163,7 @@ const char *const svr4_32_syscallnames[] = {
"netbsd32_munmap", /* 117 = netbsd32_munmap */
"fpathconf", /* 118 = fpathconf */
"vfork", /* 119 = vfork */
"fchdir", /* 120 = fchdir */
"netbsd32_fchdir", /* 120 = netbsd32_fchdir */
"netbsd32_readv", /* 121 = netbsd32_readv */
"netbsd32_writev", /* 122 = netbsd32_writev */
"xstat", /* 123 = xstat */
@ -280,14 +280,14 @@ const char *const svr4_32_syscallnames[] = {
"compat_43_netbsd32_oaccept", /* 234 = compat_43_netbsd32_oaccept */
"netbsd32_connect", /* 235 = netbsd32_connect */
"netbsd32_shutdown", /* 236 = netbsd32_shutdown */
"recv", /* 237 = recv */
"recvfrom", /* 238 = recvfrom */
"recvmsg", /* 239 = recvmsg */
"send", /* 240 = send */
"sendmsg", /* 241 = sendmsg */
"compat_43_netbsd32_orecv", /* 237 = compat_43_netbsd32_orecv */
"compat_43_netbsd32_orecvfrom", /* 238 = compat_43_netbsd32_orecvfrom */
"compat_43_netbsd32_orecvmsg", /* 239 = compat_43_netbsd32_orecvmsg */
"compat_43_netbsd32_osend", /* 240 = compat_43_netbsd32_osend */
"compat_43_netbsd32_osendmsg", /* 241 = compat_43_netbsd32_osendmsg */
"netbsd32_sendto", /* 242 = netbsd32_sendto */
"getpeername", /* 243 = getpeername */
"getsockname", /* 244 = getsockname */
"compat_43_netbsd32_ogetpeername", /* 243 = compat_43_netbsd32_ogetpeername */
"compat_43_netbsd32_ogetsockname", /* 244 = compat_43_netbsd32_ogetsockname */
"netbsd32_getsockopt", /* 245 = netbsd32_getsockopt */
"netbsd32_setsockopt", /* 246 = netbsd32_setsockopt */
"#247 (unimplemented sockconfig)", /* 247 = unimplemented sockconfig */

View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_32_sysent.c,v 1.4 2001/07/01 16:55:41 thorpej Exp $ */
/* $NetBSD: svr4_32_sysent.c,v 1.5 2001/08/15 05:18:12 eeh Exp $ */
/*
* System call switch table.
@ -28,6 +28,12 @@
#include <compat/svr4_32/svr4_32_resource.h>
#include <compat/svr4_32/svr4_32_acl.h>
#ifdef COMPAT_43
#define compat_43(func) __CONCAT(compat_43_,func)
#else
#define compat_43(func) sys_nosys
#endif
#define s(type) sizeof(type)
struct sysent svr4_32_sysent[] = {
@ -43,8 +49,8 @@ struct sysent svr4_32_sysent[] = {
netbsd32_write }, /* 4 = netbsd32_write */
{ 3, s(struct svr4_32_sys_open_args), 0,
svr4_32_sys_open }, /* 5 = open */
{ 1, s(struct sys_close_args), 0,
sys_close }, /* 6 = close */
{ 1, s(struct netbsd32_close_args), 0,
netbsd32_close }, /* 6 = netbsd32_close */
{ 1, s(struct svr4_32_sys_wait_args), 0,
svr4_32_sys_wait }, /* 7 = wait */
{ 2, s(struct svr4_32_sys_creat_args), 0,
@ -69,8 +75,8 @@ struct sysent svr4_32_sysent[] = {
svr4_32_sys_break }, /* 17 = break */
{ 2, s(struct svr4_32_sys_stat_args), 0,
svr4_32_sys_stat }, /* 18 = stat */
{ 3, s(struct compat_43_sys_lseek_args), 0,
compat_43_sys_lseek }, /* 19 = lseek */
{ 3, s(struct compat_43_netbsd32_olseek_args), 0,
compat_43_netbsd32_olseek }, /* 19 = compat_43_netbsd32_olseek */
{ 0, 0, 0,
sys_getpid }, /* 20 = getpid */
{ 0, 0, 0,
@ -286,8 +292,8 @@ struct sysent svr4_32_sysent[] = {
svr4_32_sys_fpathconf }, /* 118 = fpathconf */
{ 0, 0, 0,
sys_vfork }, /* 119 = vfork */
{ 1, s(struct sys_fchdir_args), 0,
sys_fchdir }, /* 120 = fchdir */
{ 1, s(struct netbsd32_fchdir_args), 0,
netbsd32_fchdir }, /* 120 = netbsd32_fchdir */
{ 3, s(struct netbsd32_readv_args), 0,
netbsd32_readv }, /* 121 = netbsd32_readv */
{ 3, s(struct netbsd32_writev_args), 0,
@ -520,22 +526,22 @@ struct sysent svr4_32_sysent[] = {
netbsd32_connect }, /* 235 = netbsd32_connect */
{ 2, s(struct netbsd32_shutdown_args), 0,
netbsd32_shutdown }, /* 236 = netbsd32_shutdown */
{ 4, s(struct compat_43_sys_recv_args), 0,
compat_43_sys_recv }, /* 237 = recv */
{ 6, s(struct compat_43_sys_recvfrom_args), 0,
compat_43_sys_recvfrom }, /* 238 = recvfrom */
{ 3, s(struct compat_43_sys_recvmsg_args), 0,
compat_43_sys_recvmsg }, /* 239 = recvmsg */
{ 4, s(struct compat_43_sys_send_args), 0,
compat_43_sys_send }, /* 240 = send */
{ 3, s(struct compat_43_sys_sendmsg_args), 0,
compat_43_sys_sendmsg }, /* 241 = sendmsg */
{ 4, s(struct compat_43_netbsd32_orecv_args), 0,
compat_43_netbsd32_orecv }, /* 237 = compat_43_netbsd32_orecv */
{ 6, s(struct compat_43_netbsd32_orecvfrom_args), 0,
compat_43_netbsd32_orecvfrom }, /* 238 = compat_43_netbsd32_orecvfrom */
{ 3, s(struct compat_43_netbsd32_orecvmsg_args), 0,
compat_43_netbsd32_orecvmsg }, /* 239 = compat_43_netbsd32_orecvmsg */
{ 4, s(struct compat_43_netbsd32_osend_args), 0,
compat_43_netbsd32_osend }, /* 240 = compat_43_netbsd32_osend */
{ 3, s(struct compat_43_netbsd32_osendmsg_args), 0,
compat_43_netbsd32_osendmsg }, /* 241 = compat_43_netbsd32_osendmsg */
{ 6, s(struct netbsd32_sendto_args), 0,
netbsd32_sendto }, /* 242 = netbsd32_sendto */
{ 3, s(struct compat_43_sys_getpeername_args), 0,
compat_43_sys_getpeername }, /* 243 = getpeername */
{ 3, s(struct compat_43_sys_getsockname_args), 0,
compat_43_sys_getsockname }, /* 244 = getsockname */
{ 3, s(struct compat_43_netbsd32_ogetpeername_args), 0,
compat_43_netbsd32_ogetpeername }, /* 243 = compat_43_netbsd32_ogetpeername */
{ 3, s(struct compat_43_netbsd32_ogetsockname_args), 0,
compat_43_netbsd32_ogetsockname }, /* 244 = compat_43_netbsd32_ogetsockname */
{ 5, s(struct netbsd32_getsockopt_args), 0,
netbsd32_getsockopt }, /* 245 = netbsd32_getsockopt */
{ 5, s(struct netbsd32_setsockopt_args), 0,

View File

@ -1,4 +1,4 @@
$NetBSD: syscalls.master,v 1.4 2001/07/01 16:55:19 thorpej Exp $
$NetBSD: syscalls.master,v 1.5 2001/08/15 05:18:12 eeh Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@ -63,7 +63,7 @@
4 NOARGS { int netbsd32_write(int fd, netbsd32_charp buf, u_int nbyte); }
5 STD { int svr4_32_sys_open(const netbsd32_charp path, int flags, \
int mode); }
6 NOARGS { int sys_close(int fd); }
6 NOARGS { int netbsd32_close(int fd); }
7 STD { int svr4_32_sys_wait(netbsd32_intp status); }
8 STD { int svr4_32_sys_creat(const netbsd32_charp path, int mode); }
9 NOARGS { int netbsd32_link(const netbsd32_charp path, const netbsd32_charp link); }
@ -79,8 +79,8 @@
17 STD { int svr4_32_sys_break(netbsd32_caddr_t nsize); }
18 STD { int svr4_32_sys_stat(const netbsd32_charp path, \
svr4_32_statp ub); }
19 NOARGS { netbsd32_long compat_43_sys_lseek(int fd, netbsd32_long offset, \
int whence); }
19 NOARGS { netbsd32_long compat_43_netbsd32_olseek(int fd, \
netbsd32_long offset, int whence); }
20 NOARGS { pid_t sys_getpid(void); }
21 UNIMPL old_mount
22 UNIMPL System V umount
@ -222,7 +222,7 @@
117 NOARGS { int netbsd32_munmap(netbsd32_voidp addr, netbsd32_size_t len); }
118 STD { int svr4_32_sys_fpathconf(int fd, int name); }
119 NOARGS { int sys_vfork(void); }
120 NOARGS { int sys_fchdir(int fd); }
120 NOARGS { int netbsd32_fchdir(int fd); }
121 NOARGS { int netbsd32_readv(int fd, const netbsd32_iovecp_t iovp, int iovcnt); }
122 NOARGS { int netbsd32_writev(int fd, const netbsd32_iovecp_t iovp, int iovcnt); }
123 STD { int svr4_32_sys_xstat(int two, const netbsd32_charp path, \
@ -382,24 +382,24 @@
235 NOARGS { int netbsd32_connect(int s, const netbsd32_sockaddrp_t name, \
int namelen); }
236 NOARGS { int netbsd32_shutdown(int s, int how); }
237 NOARGS { int compat_43_sys_recv(int s, netbsd32_caddr_t buf, int len, \
237 NOARGS { int compat_43_netbsd32_orecv(int s, netbsd32_caddr_t buf, int len, \
int flags); }
238 NOARGS { netbsd32_ssize_t compat_43_sys_recvfrom(int s, netbsd32_voidp buf, \
netbsd32_size_t len, int flags, netbsd32_sockaddrp_t from, \
netbsd32_intp fromlenaddr); }
239 NOARGS { netbsd32_ssize_t compat_43_sys_recvmsg(int s, \
netbsd32_msghdrp_t msg, int flags); }
240 NOARGS { int compat_43_sys_send(int s, netbsd32_caddr_t buf, int len, \
int flags); }
241 NOARGS { netbsd32_ssize_t compat_43_sys_sendmsg(int s, \
const netbsd32_msghdrp_t msg, int flags); }
238 NOARGS { int compat_43_netbsd32_orecvfrom(int s, \
netbsd32_caddr_t buf, netbsd32_size_t len, int flags, \
netbsd32_caddr_t from, netbsd32_intp fromlenaddr); }
239 NOARGS { int compat_43_netbsd32_orecvmsg(int s, \
netbsd32_omsghdrp_t msg, int flags); }
240 NOARGS { int compat_43_netbsd32_osend(int s, netbsd32_caddr_t buf, \
int len, int flags); }
241 NOARGS { int compat_43_netbsd32_osendmsg(int s, netbsd32_caddr_t msg, \
int flags); }
242 NOARGS { netbsd32_ssize_t netbsd32_sendto(int s, const netbsd32_voidp buf, \
netbsd32_size_t len, int flags, const netbsd32_sockaddrp_t to, \
int tolen); }
243 NOARGS { int compat_43_sys_getpeername(int fdes, \
netbsd32_sockaddrp_t asa, netbsd32_intp alen); }
244 NOARGS { int compat_43_sys_getsockname(int fdes, \
netbsd32_sockaddrp_t asa, netbsd32_intp alen); }
243 NOARGS { int compat_43_netbsd32_ogetpeername(int fdes, \
netbsd32_caddr_t asa, netbsd32_intp alen); }
244 NOARGS { int compat_43_netbsd32_ogetsockname(int fdec, \
netbsd32_caddr_t asa, netbsd32_intp alen); }
245 NOARGS { int netbsd32_getsockopt(int s, int level, int name, \
netbsd32_voidp val, netbsd32_intp avalsize); }
246 NOARGS { int netbsd32_setsockopt(int s, int level, int name, \