Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/svr4_32 Use the netbsd32 version of anything that...
details: https://anonhg.NetBSD.org/src/rev/92095386ca6c
branches: trunk
changeset: 513852:92095386ca6c
user: eeh <eeh%NetBSD.org@localhost>
date: Wed Aug 15 05:18:11 2001 +0000
description:
Use the netbsd32 version of anything that takes args.
diffstat:
sys/compat/svr4_32/svr4_32_syscall.h | 42 ++++++++++++++--------------
sys/compat/svr4_32/svr4_32_syscallargs.h | 22 +++++++-------
sys/compat/svr4_32/svr4_32_syscalls.c | 22 +++++++-------
sys/compat/svr4_32/svr4_32_sysent.c | 48 ++++++++++++++++++--------------
sys/compat/svr4_32/syscalls.master | 38 ++++++++++++------------
5 files changed, 89 insertions(+), 83 deletions(-)
diffs (truncated from 371 to 300 lines):
diff -r 93a7282d1d0e -r 92095386ca6c sys/compat/svr4_32/svr4_32_syscall.h
--- a/sys/compat/svr4_32/svr4_32_syscall.h Wed Aug 15 05:16:59 2001 +0000
+++ b/sys/compat/svr4_32/svr4_32_syscall.h Wed Aug 15 05:18:11 2001 +0000
@@ -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
diff -r 93a7282d1d0e -r 92095386ca6c sys/compat/svr4_32/svr4_32_syscallargs.h
--- a/sys/compat/svr4_32/svr4_32_syscallargs.h Wed Aug 15 05:16:59 2001 +0000
+++ b/sys/compat/svr4_32/svr4_32_syscallargs.h Wed Aug 15 05:18:11 2001 +0000
@@ -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 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___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_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 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 *);
diff -r 93a7282d1d0e -r 92095386ca6c sys/compat/svr4_32/svr4_32_syscalls.c
--- a/sys/compat/svr4_32/svr4_32_syscalls.c Wed Aug 15 05:16:59 2001 +0000
+++ b/sys/compat/svr4_32/svr4_32_syscalls.c Wed Aug 15 05:18:11 2001 +0000
@@ -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 @@
"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 @@
"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 @@
"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 @@
"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 */
diff -r 93a7282d1d0e -r 92095386ca6c sys/compat/svr4_32/svr4_32_sysent.c
--- a/sys/compat/svr4_32/svr4_32_sysent.c Wed Aug 15 05:16:59 2001 +0000
+++ b/sys/compat/svr4_32/svr4_32_sysent.c Wed Aug 15 05:18:11 2001 +0000
@@ -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 @@
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 @@
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 @@
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 @@
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,
diff -r 93a7282d1d0e -r 92095386ca6c sys/compat/svr4_32/syscalls.master
--- a/sys/compat/svr4_32/syscalls.master Wed Aug 15 05:16:59 2001 +0000
+++ b/sys/compat/svr4_32/syscalls.master Wed Aug 15 05:18:11 2001 +0000
@@ -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 $
Home |
Main Index |
Thread Index |
Old Index