 @@ -1,1097 +1,1096 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.233 2021/09/20 01:07:45 thorpej Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.234 2023/07/30 05:10:47 rin Exp $	*/
 /*
  * Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.233 2021/09/20 01:07:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.234 2023/07/30 05:10:47 rin Exp $");
 /*
  * below are all the standard NetBSD system calls, in the 32bit
  * environment, with the necessary conversions to 64bit before calling
  * the real syscall.  anything that needs special attention is handled
  * elsewhere - this file should only contain structure assignment and
  * calls to the original function.
  */
 /*
  * below are all the standard NetBSD system calls, in the 32bit
  * environment, with the necessary conversions to 64bit before calling
  * the real syscall.  anything that needs special attention is handled
  * elsewhere - this file should only contain structure assignment and
  * calls to the original function.
  */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_43.h"
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
 #include "opt_ntp.h"
 #include "opt_quota.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #endif
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/acct.h>
 #include <sys/dirent.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/ktrace.h>
 #include <sys/mbuf.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/quotactl.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/socketvar.h>
-#include <sys/mbuf.h>
+#include <sys/sockio.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/swap.h>
 #include <sys/syscallargs.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/signalvar.h>
 #include <sys/ptrace.h>
 #include <sys/ktrace.h>
 #include <sys/trace.h>
 #include <sys/resourcevar.h>
 #include <sys/pool.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
 #include <sys/quotactl.h>
 #include <sys/vfs_syscalls.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_swap.h>
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/exec.h>
 #include <net/if.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_conv.h>
 #include <compat/netbsd32/netbsd32_exec.h>
 #include <compat/netbsd32/netbsd32_syscall.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 #include <compat/netbsd32/netbsd32_conv.h>
 #include <compat/sys/mman.h>
 #if defined(DDB)
 #include <ddb/ddbvar.h>
 #endif
 #ifdef __HAVE_SYSCALL_INTERN
 void netbsd32_syscall_intern(struct proc *);
 #else
 void syscall(void);
 #endif
 #ifdef MODULAR
 #include <compat/netbsd32/netbsd32_syscalls_autoload.c>
 #endif
 struct emul emul_netbsd32 = {
 	.e_name =		"netbsd32",
 	.e_path =		"/emul/netbsd32",
 #ifndef __HAVE_MINIMAL_EMUL
 	.e_flags =		0,
 	.e_errno =		NULL,
 	.e_nosys =		NETBSD32_SYS_netbsd32_syscall,
 	.e_nsysent =		NETBSD32_SYS_NSYSENT,
 #endif
 	.e_sysent =		netbsd32_sysent,
 	.e_nomodbits =		netbsd32_sysent_nomodbits,
 #ifdef SYSCALL_DEBUG
 	.e_syscallnames =	netbsd32_syscallnames,
 #else
 	.e_syscallnames =	NULL,
 #endif
 #ifdef MODULAR
 	.e_sc_autoload =	netbsd32_syscalls_autoload,
 #endif
 	.e_sendsig =		netbsd32_sendsig,
 	.e_trapsignal =		trapsignal,
 	.e_sigcode =		NULL,
 	.e_esigcode =		NULL,
 	.e_sigobject =		NULL,
 	.e_setregs =		netbsd32_setregs,
 	.e_proc_exec =		NULL,
 	.e_proc_fork =		NULL,
 	.e_proc_exit =		NULL,
 	.e_lwp_fork =		NULL,
 	.e_lwp_exit =		NULL,
 #ifdef __HAVE_SYSCALL_INTERN
 	.e_syscall_intern =	netbsd32_syscall_intern,
 #else
 	.e_syscall =		syscall,
 #endif
 	.e_sysctlovly =		&netbsd32_sysctl_root,
 	.e_vm_default_addr =	netbsd32_vm_default_addr,
 	.e_usertrap =		NULL,
 	.e_ucsize =		sizeof(ucontext32_t),
 	.e_startlwp =		startlwp32,
 #ifdef notyet
 	.e_ktrpsig =		netbsd32_ktrpsig,
 #else
 	.e_ktrpsig =		NULL,
 #endif
 };
 int
 netbsd32_exit(struct lwp *l, const struct netbsd32_exit_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) rval;
 	} */
 	struct sys_exit_args ua;
 	NETBSD32TO64_UAP(rval);
 	return sys_exit(l, &ua, retval);
+}
 int
 netbsd32_read(struct lwp *l, const struct netbsd32_read_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) nbyte;
 	} */
 	struct sys_read_args ua;
 	if (SCARG(uap, nbyte) > NETBSD32_SSIZE_MAX)
 		return EINVAL;
 	NETBSD32TO64_UAP(fd);
 	NETBSD32TOP_UAP(buf, void *);
 	NETBSD32TOX_UAP(nbyte, size_t);
 	return sys_read(l, &ua, retval);
+}
 int
 netbsd32_write(struct lwp *l, const struct netbsd32_write_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) nbyte;
 	} */
 	struct sys_write_args ua;
 	if (SCARG(uap, nbyte) > NETBSD32_SSIZE_MAX)
 		return EINVAL;
 	NETBSD32TO64_UAP(fd);
 	NETBSD32TOP_UAP(buf, void *);
 	NETBSD32TOX_UAP(nbyte, size_t);
 	return sys_write(l, &ua, retval);
+}
 int
 netbsd32_close(struct lwp *l, const struct netbsd32_close_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 	} */
 	struct sys_close_args ua;
 	NETBSD32TO64_UAP(fd);
 	return sys_close(l, &ua, retval);
+}
 int
 netbsd32_open(struct lwp *l, const struct netbsd32_open_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 		syscallarg(mode_t) mode;
 	} */
 	struct sys_open_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(flags);
 	NETBSD32TO64_UAP(mode);
 	return sys_open(l, &ua, retval);
+}
 int
 netbsd32_link(struct lwp *l, const struct netbsd32_link_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(const netbsd32_charp) link;
 	} */
 	struct sys_link_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TOP_UAP(link, const char);
 	return sys_link(l, &ua, retval);
+}
 int
 netbsd32_unlink(struct lwp *l, const struct netbsd32_unlink_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 	} */
 	struct sys_unlink_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	return sys_unlink(l, &ua, retval);
+}
 int
 netbsd32_chdir(struct lwp *l, const struct netbsd32_chdir_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 	} */
 	struct sys_chdir_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	return sys_chdir(l, &ua, retval);
+}
 int
 netbsd32_fchdir(struct lwp *l, const struct netbsd32_fchdir_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 	} */
 	struct sys_fchdir_args ua;
 	NETBSD32TO64_UAP(fd);
 	return sys_fchdir(l, &ua, retval);
+}
 int
 netbsd32___mknod50(struct lwp *l, const struct netbsd32___mknod50_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 		syscallarg(netbsd32_dev_t) dev;
 	} */
 	return do_posix_mknodat(l, AT_FDCWD, SCARG_P32(uap, path),
 	    SCARG(uap, mode), SCARG(uap, dev));
+}
 int
 netbsd32_chmod(struct lwp *l, const struct netbsd32_chmod_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */
 	struct sys_chmod_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(mode);
 	return sys_chmod(l, &ua, retval);
+}
 int
 netbsd32_chown(struct lwp *l, const struct netbsd32_chown_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
 	} */
 	struct sys_chown_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(uid);
 	NETBSD32TO64_UAP(gid);
 	return sys_chown(l, &ua, retval);
+}
 int
 netbsd32_break(struct lwp *l, const struct netbsd32_break_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_charp) nsize;
 	} */
 	struct sys_obreak_args ua;
 	NETBSD32TOP_UAP(nsize, char);
 	return sys_obreak(l, &ua, retval);
+}
 int
 netbsd32_unmount(struct lwp *l, const struct netbsd32_unmount_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 	} */
 	struct sys_unmount_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(flags);
 	return sys_unmount(l, &ua, retval);
+}
 int
 netbsd32_setuid(struct lwp *l, const struct netbsd32_setuid_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(uid_t) uid;
 	} */
 	struct sys_setuid_args ua;
 	NETBSD32TO64_UAP(uid);
 	return sys_setuid(l, &ua, retval);
+}
 int
 netbsd32_accept(struct lwp *l, const struct netbsd32_accept_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_sockaddrp_t) name;
 		syscallarg(netbsd32_intp) anamelen;
 	} */
 	struct sys_accept_args ua;
 	NETBSD32TO64_UAP(s);
 	NETBSD32TOP_UAP(name, struct sockaddr);
 	NETBSD32TOP_UAP(anamelen, socklen_t);
 	return sys_accept(l, &ua, retval);
+}
 int
 netbsd32_getpeername(struct lwp *l, const struct netbsd32_getpeername_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fdes;
 		syscallarg(netbsd32_sockaddrp_t) asa;
 		syscallarg(netbsd32_intp) alen;
 	} */
 	struct sys_getpeername_args ua;
 	NETBSD32TO64_UAP(fdes);
 	NETBSD32TOP_UAP(asa, struct sockaddr);
 	NETBSD32TOP_UAP(alen, socklen_t);
 /* NB: do the protocol specific sockaddrs need to be converted? */
 	return sys_getpeername(l, &ua, retval);
+}
 int
 netbsd32_getsockname(struct lwp *l, const struct netbsd32_getsockname_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fdes;
 		syscallarg(netbsd32_sockaddrp_t) asa;
 		syscallarg(netbsd32_intp) alen;
 	} */
 	struct sys_getsockname_args ua;
 	NETBSD32TO64_UAP(fdes);
 	NETBSD32TOP_UAP(asa, struct sockaddr);
 	NETBSD32TOP_UAP(alen, socklen_t);
 	return sys_getsockname(l, &ua, retval);
+}
 int
 netbsd32_access(struct lwp *l, const struct netbsd32_access_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 	} */
 	struct sys_access_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(flags);
 	return sys_access(l, &ua, retval);
+}
 int
 netbsd32_chflags(struct lwp *l, const struct netbsd32_chflags_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_u_long) flags;
 	} */
 	struct sys_chflags_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(flags);
 	return sys_chflags(l, &ua, retval);
+}
 int
 netbsd32_fchflags(struct lwp *l, const struct netbsd32_fchflags_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_u_long) flags;
 	} */
 	struct sys_fchflags_args ua;
 	NETBSD32TO64_UAP(fd);
 	NETBSD32TO64_UAP(flags);
 	return sys_fchflags(l, &ua, retval);
+}
 int
 netbsd32_lchflags(struct lwp *l, const struct netbsd32_lchflags_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const char *) path;
 		syscallarg(netbsd32_u_long) flags;
 	} */
 	struct sys_lchflags_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(flags);
 	return sys_lchflags(l, &ua, retval);
+}
 int
 netbsd32_kill(struct lwp *l, const struct netbsd32_kill_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) pid;
 		syscallarg(int) signum;
 	} */
 	struct sys_kill_args ua;
 	NETBSD32TO64_UAP(pid);
 	NETBSD32TO64_UAP(signum);
 	return sys_kill(l, &ua, retval);
+}
 int
 netbsd32_dup(struct lwp *l, const struct netbsd32_dup_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 	} */
 	struct sys_dup_args ua;
 	NETBSD32TO64_UAP(fd);
 	return sys_dup(l, &ua, retval);
+}
 int
 netbsd32_profil(struct lwp *l, const struct netbsd32_profil_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_voidp) samples;
 		syscallarg(netbsd32_size_t) size;
 		syscallarg(netbsd32_u_long) offset;
 		syscallarg(u_int) scale;
 	} */
 	struct sys_profil_args ua;
 	NETBSD32TOP_UAP(samples, void *);
 	NETBSD32TOX_UAP(size, size_t);
 	NETBSD32TOX_UAP(offset, u_long);
 	NETBSD32TO64_UAP(scale);
 	return sys_profil(l, &ua, retval);
+}
 int
 netbsd32_ktrace(struct lwp *l, const struct netbsd32_ktrace_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) fname;
 		syscallarg(int) ops;
 		syscallarg(int) facs;
 		syscallarg(int) pid;
 	} */
 	struct sys_ktrace_args ua;
 	NETBSD32TOP_UAP(fname, const char);
 	NETBSD32TO64_UAP(ops);
 	NETBSD32TO64_UAP(facs);
 	NETBSD32TO64_UAP(pid);
 	return sys_ktrace(l, &ua, retval);
+}
 int
 netbsd32_utrace(struct lwp *l, const struct netbsd32_utrace_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) label;
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 	} */
 	struct sys_utrace_args ua;
 	NETBSD32TOP_UAP(label, const char);
 	NETBSD32TOP_UAP(addr, void);
 	NETBSD32TO64_UAP(len);
 	return sys_utrace(l, &ua, retval);
+}
 int
 netbsd32___getlogin(struct lwp *l, const struct netbsd32___getlogin_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_charp) namebuf;
 		syscallarg(u_int) namelen;
 	} */
 	struct sys___getlogin_args ua;
 	NETBSD32TOP_UAP(namebuf, char);
 	NETBSD32TO64_UAP(namelen);
 	return sys___getlogin(l, &ua, retval);
+}
 int
 netbsd32_setlogin(struct lwp *l, const struct netbsd32_setlogin_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) namebuf;
 	} */
 	struct sys___setlogin_args ua;
 	NETBSD32TOP_UAP(namebuf, char);
 	return sys___setlogin(l, &ua, retval);
+}
 int
 netbsd32_acct(struct lwp *l, const struct netbsd32_acct_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 	} */
 	struct sys_acct_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	return sys_acct(l, &ua, retval);
+}
 int
 netbsd32_revoke(struct lwp *l, const struct netbsd32_revoke_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 	} */
 	struct sys_revoke_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	return sys_revoke(l, &ua, retval);
+}
 int
 netbsd32_symlink(struct lwp *l, const struct netbsd32_symlink_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(const netbsd32_charp) link;
 	} */
 	struct sys_symlink_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TOP_UAP(link, const char);
 	return sys_symlink(l, &ua, retval);
+}
 int
 netbsd32_readlink(struct lwp *l, const struct netbsd32_readlink_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_charp) buf;
 		syscallarg(netbsd32_size_t) count;
 	} */
 	struct sys_readlink_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TOP_UAP(buf, char);
 	NETBSD32TOX_UAP(count, size_t);
 	return sys_readlink(l, &ua, retval);
+}
 int
 netbsd32_umask(struct lwp *l, const struct netbsd32_umask_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(mode_t) newmask;
 	} */
 	struct sys_umask_args ua;
 	NETBSD32TO64_UAP(newmask);
 	return sys_umask(l, &ua, retval);
+}
 int
 netbsd32_chroot(struct lwp *l, const struct netbsd32_chroot_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 	} */
 	struct sys_chroot_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	return sys_chroot(l, &ua, retval);
+}
 int
 netbsd32_munmap(struct lwp *l, const struct netbsd32_munmap_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 	} */
 	struct sys_munmap_args ua;
 	NETBSD32TOP_UAP(addr, void);
 	NETBSD32TOX_UAP(len, size_t);
 	return sys_munmap(l, &ua, retval);
+}
 int
 netbsd32_mprotect(struct lwp *l, const struct netbsd32_mprotect_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) prot;
 	} */
 	struct sys_mprotect_args ua;
 	NETBSD32TOP_UAP(addr, void);
 	NETBSD32TOX_UAP(len, size_t);
 	NETBSD32TO64_UAP(prot);
 	return sys_mprotect(l, &ua, retval);
+}
 int
 netbsd32_madvise(struct lwp *l, const struct netbsd32_madvise_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) behav;
 	} */
 	struct sys_madvise_args ua;
 	NETBSD32TOP_UAP(addr, void);
 	NETBSD32TOX_UAP(len, size_t);
 	NETBSD32TO64_UAP(behav);
 	return sys_madvise(l, &ua, retval);
+}
 int
 netbsd32_mincore(struct lwp *l, const struct netbsd32_mincore_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(netbsd32_charp) vec;
 	} */
 	struct sys_mincore_args ua;
 	NETBSD32TOP_UAP(addr, void *);
 	NETBSD32TOX_UAP(len, size_t);
 	NETBSD32TOP_UAP(vec, char);
 	return sys_mincore(l, &ua, retval);
+}
 int
 netbsd32_getgroups(struct lwp *l, const struct netbsd32_getgroups_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) gidsetsize;
 		syscallarg(netbsd32_gid_tp) gidset;
 	} */
 	struct sys_getgroups_args ua;
 	/* Since sizeof (gid_t) == sizeof (netbsd32_gid_t) ... */
 	NETBSD32TO64_UAP(gidsetsize);
 	NETBSD32TOP_UAP(gidset, gid_t);
 	return sys_getgroups(l, &ua, retval);
+}
 int
 netbsd32_setgroups(struct lwp *l, const struct netbsd32_setgroups_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) gidsetsize;
 		syscallarg(const netbsd32_gid_tp) gidset;
 	} */
 	struct sys_setgroups_args ua;
 	NETBSD32TO64_UAP(gidsetsize);
 	NETBSD32TOP_UAP(gidset, gid_t);
 	return sys_setgroups(l, &ua, retval);
+}
 int
 netbsd32_setpgid(struct lwp *l, const struct netbsd32_setpgid_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) pid;
 		syscallarg(int) pgid;
 	} */
 	struct sys_setpgid_args ua;
 	NETBSD32TO64_UAP(pid);
 	NETBSD32TO64_UAP(pgid);
 	return sys_setpgid(l, &ua, retval);
+}
 int
 netbsd32_fcntl(struct lwp *l, const struct netbsd32_fcntl_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(int) cmd;
 		syscallarg(netbsd32_voidp) arg;
 	} */
 	struct sys_fcntl_args ua;
 	NETBSD32TO64_UAP(fd);
 	NETBSD32TO64_UAP(cmd);
 	/* we can do this because `struct flock' doesn't change */
 	NETBSD32TOP_UAP(arg, void);
 	return sys_fcntl(l, &ua, retval);
+}
 int
 netbsd32_dup2(struct lwp *l, const struct netbsd32_dup2_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) from;
 		syscallarg(int) to;
 	} */
 	struct sys_dup2_args ua;
 	NETBSD32TO64_UAP(from);
 	NETBSD32TO64_UAP(to);
 	return sys_dup2(l, &ua, retval);
+}
 int
 netbsd32_fsync(struct lwp *l, const struct netbsd32_fsync_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 	} */
 	struct sys_fsync_args ua;
 	NETBSD32TO64_UAP(fd);
 	return sys_fsync(l, &ua, retval);
+}
 int
 netbsd32_setpriority(struct lwp *l, const struct netbsd32_setpriority_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) which;
 		syscallarg(int) who;
 		syscallarg(int) prio;
 	} */
 	struct sys_setpriority_args ua;
 	NETBSD32TO64_UAP(which);
 	NETBSD32TO64_UAP(who);
 	NETBSD32TO64_UAP(prio);
 	return sys_setpriority(l, &ua, retval);
+}
 int
 netbsd32___socket30(struct lwp *l, const struct netbsd32___socket30_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) domain;
 		syscallarg(int) type;
 		syscallarg(int) protocol;
 	} */
 	struct sys___socket30_args ua;
 	NETBSD32TO64_UAP(domain);
 	NETBSD32TO64_UAP(type);
 	NETBSD32TO64_UAP(protocol);
 	return sys___socket30(l, &ua, retval);
+}
 int
 netbsd32_connect(struct lwp *l, const struct netbsd32_connect_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(const netbsd32_sockaddrp_t) name;
 		syscallarg(int) namelen;
 	} */
 	struct sys_connect_args ua;
 	NETBSD32TO64_UAP(s);
 	NETBSD32TOP_UAP(name, struct sockaddr);
 	NETBSD32TO64_UAP(namelen);
 	return sys_connect(l, &ua, retval);
+}
 int
 netbsd32_getpriority(struct lwp *l, const struct netbsd32_getpriority_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) which;
 		syscallarg(int) who;
 	} */
 	struct sys_getpriority_args ua;
 	NETBSD32TO64_UAP(which);
 	NETBSD32TO64_UAP(who);
 	return sys_getpriority(l, &ua, retval);
+}
 int
 netbsd32_bind(struct lwp *l, const struct netbsd32_bind_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(const netbsd32_sockaddrp_t) name;
 		syscallarg(int) namelen;
 	} */
 	struct sys_bind_args ua;
 	NETBSD32TO64_UAP(s);
 	NETBSD32TOP_UAP(name, struct sockaddr);
 	NETBSD32TO64_UAP(namelen);
 	return sys_bind(l, &ua, retval);
+}
 int
 netbsd32_setsockopt(struct lwp *l, const struct netbsd32_setsockopt_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(int) level;
 		syscallarg(int) name;
 		syscallarg(const netbsd32_voidp) val;
 		syscallarg(int) valsize;
 	} */
 	struct sys_setsockopt_args ua;
 	NETBSD32TO64_UAP(s);
 	NETBSD32TO64_UAP(level);
 	NETBSD32TO64_UAP(name);
 	NETBSD32TOP_UAP(val, void);
 	NETBSD32TO64_UAP(valsize);
 	/* may be more efficient to do this inline. */
 	return sys_setsockopt(l, &ua, retval);
+}
 int
 netbsd32_listen(struct lwp *l, const struct netbsd32_listen_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(int) backlog;
 	} */
 	struct sys_listen_args ua;
 	NETBSD32TO64_UAP(s);
 	NETBSD32TO64_UAP(backlog);
 	return sys_listen(l, &ua, retval);
+}
 int
 netbsd32_fchown(struct lwp *l, const struct netbsd32_fchown_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
 	} */
 	struct sys_fchown_args ua;
 	NETBSD32TO64_UAP(fd);
 	NETBSD32TO64_UAP(uid);
 	NETBSD32TO64_UAP(gid);
 	return sys_fchown(l, &ua, retval);
+}
 int
 netbsd32_fchmod(struct lwp *l, const struct netbsd32_fchmod_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(mode_t) mode;
 	} */
 	struct sys_fchmod_args ua;
 	NETBSD32TO64_UAP(fd);
 	NETBSD32TO64_UAP(mode);
 	return sys_fchmod(l, &ua, retval);
+}
 int
 netbsd32_setreuid(struct lwp *l, const struct netbsd32_setreuid_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(uid_t) ruid;
 		syscallarg(uid_t) euid;
 	} */
 	struct sys_setreuid_args ua;
 	NETBSD32TO64_UAP(ruid);
 	NETBSD32TO64_UAP(euid);
 	return sys_setreuid(l, &ua, retval);
+}
 int
 netbsd32_setregid(struct lwp *l, const struct netbsd32_setregid_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(gid_t) rgid;
 		syscallarg(gid_t) egid;
 	} */
 	struct sys_setregid_args ua;
 	NETBSD32TO64_UAP(rgid);
 	NETBSD32TO64_UAP(egid);
 	return sys_setregid(l, &ua, retval);
+}
 int
 netbsd32_getsockopt(struct lwp *l, const struct netbsd32_getsockopt_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(int) level;
 		syscallarg(int) name;
 		syscallarg(netbsd32_voidp) val;
 		syscallarg(netbsd32_intp) avalsize;
 	} */
 	struct sys_getsockopt_args ua;
 	NETBSD32TO64_UAP(s);
 	NETBSD32TO64_UAP(level);
 	NETBSD32TO64_UAP(name);
 	NETBSD32TOP_UAP(val, void);
 	NETBSD32TOP_UAP(avalsize, socklen_t);
 	return sys_getsockopt(l, &ua, retval);
+}
 int
 netbsd32_getsockopt2(struct lwp *l, const struct netbsd32_getsockopt2_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) s;
 		syscallarg(int) level;
 		syscallarg(int) name;
 		syscallarg(netbsd32_voidp) val;
 		syscallarg(netbsd32_intp) avalsize;
 	} */
 	struct sys_getsockopt2_args ua;
 	NETBSD32TO64_UAP(s);
 	NETBSD32TO64_UAP(level);
 	NETBSD32TO64_UAP(name);
 	NETBSD32TOP_UAP(val, void);
 	NETBSD32TOP_UAP(avalsize, socklen_t);
 	return sys_getsockopt2(l, &ua, retval);
+}
 int
 netbsd32_rename(struct lwp *l, const struct netbsd32_rename_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) from;
 		syscallarg(const netbsd32_charp) to;
 	} */
 	struct sys_rename_args ua;
 	NETBSD32TOP_UAP(from, const char);
 	NETBSD32TOP_UAP(to, const char);
 	return sys_rename(l, &ua, retval);
+}
 int
 netbsd32_flock(struct lwp *l, const struct netbsd32_flock_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(int) how;
 	} */
 	struct sys_flock_args ua;
 	NETBSD32TO64_UAP(fd);
 	NETBSD32TO64_UAP(how);
 	return sys_flock(l, &ua, retval);