Regenerated (fixed the calculation of sy_nargs in sysent tables).

1 files changed, 256 insertions, 254 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index ca78dab0e9f5..2068250f2a62 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -12,6 +12,8 @@
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 #ifdef COMPAT_43
 #define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)
 #else
@@ -21,215 +23,215 @@
 /* The casts are bogus but will do for now. */
 struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = syscall */
-	{ 1, (sy_call_t *)exit },			/* 1 = exit */
+	{ AS(rexit_args), (sy_call_t *)exit },		/* 1 = exit */
 	{ 0, (sy_call_t *)fork },			/* 2 = fork */
-	{ 3, (sy_call_t *)read },			/* 3 = read */
-	{ 3, (sy_call_t *)write },			/* 4 = write */
-	{ 3, (sy_call_t *)open },			/* 5 = open */
-	{ 1, (sy_call_t *)close },			/* 6 = close */
-	{ 4, (sy_call_t *)wait4 },			/* 7 = wait4 */
-	{ compat(2,creat) },		/* 8 = old creat */
-	{ 2, (sy_call_t *)link },			/* 9 = link */
-	{ 1, (sy_call_t *)unlink },			/* 10 = unlink */
+	{ AS(read_args), (sy_call_t *)read },		/* 3 = read */
+	{ AS(write_args), (sy_call_t *)write },		/* 4 = write */
+	{ AS(open_args), (sy_call_t *)open },		/* 5 = open */
+	{ AS(close_args), (sy_call_t *)close },		/* 6 = close */
+	{ AS(wait_args), (sy_call_t *)wait4 },		/* 7 = wait4 */
+	{ compat(AS(ocreat_args),creat) },		/* 8 = old creat */
+	{ AS(link_args), (sy_call_t *)link },		/* 9 = link */
+	{ AS(unlink_args), (sy_call_t *)unlink },	/* 10 = unlink */
 	{ 0, (sy_call_t *)nosys },			/* 11 = obsolete execv */
-	{ 1, (sy_call_t *)chdir },			/* 12 = chdir */
-	{ 1, (sy_call_t *)fchdir },			/* 13 = fchdir */
-	{ 3, (sy_call_t *)mknod },			/* 14 = mknod */
-	{ 2, (sy_call_t *)chmod },			/* 15 = chmod */
-	{ 3, (sy_call_t *)chown },			/* 16 = chown */
-	{ 1, (sy_call_t *)obreak },			/* 17 = break */
-	{ 3, (sy_call_t *)getfsstat },			/* 18 = getfsstat */
-	{ compat(3,lseek) },		/* 19 = old lseek */
+	{ AS(chdir_args), (sy_call_t *)chdir },		/* 12 = chdir */
+	{ AS(fchdir_args), (sy_call_t *)fchdir },	/* 13 = fchdir */
+	{ AS(mknod_args), (sy_call_t *)mknod },		/* 14 = mknod */
+	{ AS(chmod_args), (sy_call_t *)chmod },		/* 15 = chmod */
+	{ AS(chown_args), (sy_call_t *)chown },		/* 16 = chown */
+	{ AS(obreak_args), (sy_call_t *)obreak },	/* 17 = break */
+	{ AS(getfsstat_args), (sy_call_t *)getfsstat },	/* 18 = getfsstat */
+	{ compat(AS(olseek_args),lseek) },		/* 19 = old lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
-	{ 4, (sy_call_t *)mount },			/* 21 = mount */
-	{ 2, (sy_call_t *)unmount },			/* 22 = unmount */
-	{ 1, (sy_call_t *)setuid },			/* 23 = setuid */
-	{ SYF_MPSAFE | 0, (sy_call_t *)getuid },		/* 24 = getuid */
-	{ SYF_MPSAFE | 0, (sy_call_t *)geteuid },		/* 25 = geteuid */
-	{ 4, (sy_call_t *)ptrace },			/* 26 = ptrace */
-	{ 3, (sy_call_t *)recvmsg },			/* 27 = recvmsg */
-	{ 3, (sy_call_t *)sendmsg },			/* 28 = sendmsg */
-	{ 6, (sy_call_t *)recvfrom },			/* 29 = recvfrom */
-	{ 3, (sy_call_t *)accept },			/* 30 = accept */
-	{ 3, (sy_call_t *)getpeername },		/* 31 = getpeername */
-	{ 3, (sy_call_t *)getsockname },		/* 32 = getsockname */
-	{ 2, (sy_call_t *)access },			/* 33 = access */
-	{ 2, (sy_call_t *)chflags },			/* 34 = chflags */
-	{ 2, (sy_call_t *)fchflags },			/* 35 = fchflags */
+	{ AS(mount_args), (sy_call_t *)mount },		/* 21 = mount */
+	{ AS(unmount_args), (sy_call_t *)unmount },	/* 22 = unmount */
+	{ AS(setuid_args), (sy_call_t *)setuid },	/* 23 = setuid */
+	{ SYF_MPSAFE | 0, (sy_call_t *)getuid },	/* 24 = getuid */
+	{ SYF_MPSAFE | 0, (sy_call_t *)geteuid },	/* 25 = geteuid */
+	{ AS(ptrace_args), (sy_call_t *)ptrace },	/* 26 = ptrace */
+	{ AS(recvmsg_args), (sy_call_t *)recvmsg },	/* 27 = recvmsg */
+	{ AS(sendmsg_args), (sy_call_t *)sendmsg },	/* 28 = sendmsg */
+	{ AS(recvfrom_args), (sy_call_t *)recvfrom },	/* 29 = recvfrom */
+	{ AS(accept_args), (sy_call_t *)accept },	/* 30 = accept */
+	{ AS(getpeername_args), (sy_call_t *)getpeername },	/* 31 = getpeername */
+	{ AS(getsockname_args), (sy_call_t *)getsockname },	/* 32 = getsockname */
+	{ AS(access_args), (sy_call_t *)access },	/* 33 = access */
+	{ AS(chflags_args), (sy_call_t *)chflags },	/* 34 = chflags */
+	{ AS(fchflags_args), (sy_call_t *)fchflags },	/* 35 = fchflags */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
-	{ 2, (sy_call_t *)kill },			/* 37 = kill */
-	{ compat(2,stat) },		/* 38 = old stat */
+	{ AS(kill_args), (sy_call_t *)kill },		/* 37 = kill */
+	{ compat(AS(ostat_args),stat) },		/* 38 = old stat */
 	{ 0, (sy_call_t *)getppid },			/* 39 = getppid */
-	{ compat(2,lstat) },		/* 40 = old lstat */
-	{ 1, (sy_call_t *)dup },			/* 41 = dup */
+	{ compat(AS(olstat_args),lstat) },		/* 40 = old lstat */
+	{ AS(dup_args), (sy_call_t *)dup },		/* 41 = dup */
 	{ 0, (sy_call_t *)pipe },			/* 42 = pipe */
 	{ 0, (sy_call_t *)getegid },			/* 43 = getegid */
-	{ 4, (sy_call_t *)profil },			/* 44 = profil */
-	{ 4, (sy_call_t *)ktrace },			/* 45 = ktrace */
-	{ compat(3,sigaction) },		/* 46 = old sigaction */
-	{ SYF_MPSAFE | 0, (sy_call_t *)getgid },		/* 47 = getgid */
-	{ compat(SYF_MPSAFE | 2,sigprocmask) },		/* 48 = old sigprocmask */
-	{ 2, (sy_call_t *)getlogin },			/* 49 = getlogin */
-	{ 1, (sy_call_t *)setlogin },			/* 50 = setlogin */
-	{ 1, (sy_call_t *)acct },			/* 51 = acct */
-	{ compat(0,sigpending) },		/* 52 = old sigpending */
-	{ 2, (sy_call_t *)sigaltstack },		/* 53 = sigaltstack */
-	{ 3, (sy_call_t *)ioctl },			/* 54 = ioctl */
-	{ 1, (sy_call_t *)reboot },			/* 55 = reboot */
-	{ 1, (sy_call_t *)revoke },			/* 56 = revoke */
-	{ 2, (sy_call_t *)symlink },			/* 57 = symlink */
-	{ 3, (sy_call_t *)readlink },			/* 58 = readlink */
-	{ 3, (sy_call_t *)execve },			/* 59 = execve */
-	{ SYF_MPSAFE | 1, (sy_call_t *)umask },		/* 60 = umask */
-	{ 1, (sy_call_t *)chroot },			/* 61 = chroot */
-	{ compat(2,fstat) },		/* 62 = old fstat */
-	{ compat(4,getkerninfo) },		/* 63 = old getkerninfo */
-	{ compat(0,getpagesize) },		/* 64 = old getpagesize */
-	{ 3, (sy_call_t *)msync },			/* 65 = msync */
+	{ AS(profil_args), (sy_call_t *)profil },	/* 44 = profil */
+	{ AS(ktrace_args), (sy_call_t *)ktrace },	/* 45 = ktrace */
+	{ compat(AS(osigaction_args),sigaction) },	/* 46 = old sigaction */
+	{ SYF_MPSAFE | 0, (sy_call_t *)getgid },	/* 47 = getgid */
+	{ compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask) },	/* 48 = old sigprocmask */
+	{ AS(getlogin_args), (sy_call_t *)getlogin },	/* 49 = getlogin */
+	{ AS(setlogin_args), (sy_call_t *)setlogin },	/* 50 = setlogin */
+	{ AS(acct_args), (sy_call_t *)acct },		/* 51 = acct */
+	{ compat(0,sigpending) },			/* 52 = old sigpending */
+	{ AS(sigaltstack_args), (sy_call_t *)sigaltstack },	/* 53 = sigaltstack */
+	{ AS(ioctl_args), (sy_call_t *)ioctl },		/* 54 = ioctl */
+	{ AS(reboot_args), (sy_call_t *)reboot },	/* 55 = reboot */
+	{ AS(revoke_args), (sy_call_t *)revoke },	/* 56 = revoke */
+	{ AS(symlink_args), (sy_call_t *)symlink },	/* 57 = symlink */
+	{ AS(readlink_args), (sy_call_t *)readlink },	/* 58 = readlink */
+	{ AS(execve_args), (sy_call_t *)execve },	/* 59 = execve */
+	{ SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask },	/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
+	{ compat(AS(ofstat_args),fstat) },		/* 62 = old fstat */
+	{ compat(AS(getkerninfo_args),getkerninfo) },	/* 63 = old getkerninfo */
+	{ compat(0,getpagesize) },			/* 64 = old getpagesize */
+	{ AS(msync_args), (sy_call_t *)msync },		/* 65 = msync */
 	{ 0, (sy_call_t *)vfork },			/* 66 = vfork */
 	{ 0, (sy_call_t *)nosys },			/* 67 = obsolete vread */
 	{ 0, (sy_call_t *)nosys },			/* 68 = obsolete vwrite */
-	{ 1, (sy_call_t *)sbrk },			/* 69 = sbrk */
-	{ 1, (sy_call_t *)sstk },			/* 70 = sstk */
-	{ compat(6,mmap) },		/* 71 = old mmap */
-	{ 1, (sy_call_t *)ovadvise },			/* 72 = vadvise */
-	{ 2, (sy_call_t *)munmap },			/* 73 = munmap */
-	{ 3, (sy_call_t *)mprotect },			/* 74 = mprotect */
-	{ 3, (sy_call_t *)madvise },			/* 75 = madvise */
+	{ AS(sbrk_args), (sy_call_t *)sbrk },		/* 69 = sbrk */
+	{ AS(sstk_args), (sy_call_t *)sstk },		/* 70 = sstk */
+	{ compat(AS(ommap_args),mmap) },		/* 71 = old mmap */
+	{ AS(ovadvise_args), (sy_call_t *)ovadvise },	/* 72 = vadvise */
+	{ AS(munmap_args), (sy_call_t *)munmap },	/* 73 = munmap */
+	{ AS(mprotect_args), (sy_call_t *)mprotect },	/* 74 = mprotect */
+	{ AS(madvise_args), (sy_call_t *)madvise },	/* 75 = madvise */
 	{ 0, (sy_call_t *)nosys },			/* 76 = obsolete vhangup */
 	{ 0, (sy_call_t *)nosys },			/* 77 = obsolete vlimit */
-	{ 3, (sy_call_t *)mincore },			/* 78 = mincore */
-	{ 2, (sy_call_t *)getgroups },			/* 79 = getgroups */
-	{ 2, (sy_call_t *)setgroups },			/* 80 = setgroups */
-	{ SYF_MPSAFE | 0, (sy_call_t *)getpgrp },		/* 81 = getpgrp */
-	{ 2, (sy_call_t *)setpgid },			/* 82 = setpgid */
-	{ 3, (sy_call_t *)setitimer },			/* 83 = setitimer */
-	{ compat(0,wait) },		/* 84 = old wait */
-	{ 1, (sy_call_t *)swapon },			/* 85 = swapon */
-	{ 2, (sy_call_t *)getitimer },			/* 86 = getitimer */
-	{ compat(2,gethostname) },		/* 87 = old gethostname */
-	{ compat(2,sethostname) },		/* 88 = old sethostname */
+	{ AS(mincore_args), (sy_call_t *)mincore },	/* 78 = mincore */
+	{ AS(getgroups_args), (sy_call_t *)getgroups },	/* 79 = getgroups */
+	{ AS(setgroups_args), (sy_call_t *)setgroups },	/* 80 = setgroups */
+	{ SYF_MPSAFE | 0, (sy_call_t *)getpgrp },	/* 81 = getpgrp */
+	{ AS(setpgid_args), (sy_call_t *)setpgid },	/* 82 = setpgid */
+	{ AS(setitimer_args), (sy_call_t *)setitimer },	/* 83 = setitimer */
+	{ compat(0,wait) },				/* 84 = old wait */
+	{ AS(swapon_args), (sy_call_t *)swapon },	/* 85 = swapon */
+	{ AS(getitimer_args), (sy_call_t *)getitimer },	/* 86 = getitimer */
+	{ compat(AS(gethostname_args),gethostname) },	/* 87 = old gethostname */
+	{ compat(AS(sethostname_args),sethostname) },	/* 88 = old sethostname */
 	{ 0, (sy_call_t *)getdtablesize },		/* 89 = getdtablesize */
-	{ 2, (sy_call_t *)dup2 },			/* 90 = dup2 */
+	{ AS(dup2_args), (sy_call_t *)dup2 },		/* 90 = dup2 */
 	{ 0, (sy_call_t *)nosys },			/* 91 = getdopt */
-	{ 3, (sy_call_t *)fcntl },			/* 92 = fcntl */
-	{ 5, (sy_call_t *)select },			/* 93 = select */
+	{ AS(fcntl_args), (sy_call_t *)fcntl },		/* 92 = fcntl */
+	{ AS(select_args), (sy_call_t *)select },	/* 93 = select */
 	{ 0, (sy_call_t *)nosys },			/* 94 = setdopt */
-	{ 1, (sy_call_t *)fsync },			/* 95 = fsync */
-	{ 3, (sy_call_t *)setpriority },		/* 96 = setpriority */
-	{ 3, (sy_call_t *)socket },			/* 97 = socket */
-	{ 3, (sy_call_t *)connect },			/* 98 = connect */
-	{ compat(3,accept) },		/* 99 = old accept */
-	{ 2, (sy_call_t *)getpriority },		/* 100 = getpriority */
-	{ compat(4,send) },		/* 101 = old send */
-	{ compat(4,recv) },		/* 102 = old recv */
-	{ compat(1,sigreturn) },		/* 103 = old sigreturn */
-	{ 3, (sy_call_t *)bind },			/* 104 = bind */
-	{ 5, (sy_call_t *)setsockopt },			/* 105 = setsockopt */
-	{ 2, (sy_call_t *)listen },			/* 106 = listen */
+	{ AS(fsync_args), (sy_call_t *)fsync },		/* 95 = fsync */
+	{ AS(setpriority_args), (sy_call_t *)setpriority },	/* 96 = setpriority */
+	{ AS(socket_args), (sy_call_t *)socket },	/* 97 = socket */
+	{ AS(connect_args), (sy_call_t *)connect },	/* 98 = connect */
+	{ compat(AS(accept_args),accept) },		/* 99 = old accept */
+	{ AS(getpriority_args), (sy_call_t *)getpriority },	/* 100 = getpriority */
+	{ compat(AS(osend_args),send) },		/* 101 = old send */
+	{ compat(AS(orecv_args),recv) },		/* 102 = old recv */
+	{ compat(AS(osigreturn_args),sigreturn) },	/* 103 = old sigreturn */
+	{ AS(bind_args), (sy_call_t *)bind },		/* 104 = bind */
+	{ AS(setsockopt_args), (sy_call_t *)setsockopt },	/* 105 = setsockopt */
+	{ AS(listen_args), (sy_call_t *)listen },	/* 106 = listen */
 	{ 0, (sy_call_t *)nosys },			/* 107 = obsolete vtimes */
-	{ compat(3,sigvec) },		/* 108 = old sigvec */
-	{ compat(1,sigblock) },		/* 109 = old sigblock */
-	{ compat(1,sigsetmask) },		/* 110 = old sigsetmask */
-	{ compat(1,sigsuspend) },		/* 111 = old sigsuspend */
-	{ compat(2,sigstack) },		/* 112 = old sigstack */
-	{ compat(3,recvmsg) },		/* 113 = old recvmsg */
-	{ compat(3,sendmsg) },		/* 114 = old sendmsg */
+	{ compat(AS(osigvec_args),sigvec) },		/* 108 = old sigvec */
+	{ compat(AS(osigblock_args),sigblock) },	/* 109 = old sigblock */
+	{ compat(AS(osigsetmask_args),sigsetmask) },	/* 110 = old sigsetmask */
+	{ compat(AS(osigsuspend_args),sigsuspend) },	/* 111 = old sigsuspend */
+	{ compat(AS(osigstack_args),sigstack) },	/* 112 = old sigstack */
+	{ compat(AS(orecvmsg_args),recvmsg) },		/* 113 = old recvmsg */
+	{ compat(AS(osendmsg_args),sendmsg) },		/* 114 = old sendmsg */
 	{ 0, (sy_call_t *)nosys },			/* 115 = obsolete vtrace */
-	{ 2, (sy_call_t *)gettimeofday },		/* 116 = gettimeofday */
-	{ 2, (sy_call_t *)getrusage },			/* 117 = getrusage */
-	{ 5, (sy_call_t *)getsockopt },			/* 118 = getsockopt */
+	{ AS(gettimeofday_args), (sy_call_t *)gettimeofday },	/* 116 = gettimeofday */
+	{ AS(getrusage_args), (sy_call_t *)getrusage },	/* 117 = getrusage */
+	{ AS(getsockopt_args), (sy_call_t *)getsockopt },	/* 118 = getsockopt */
 	{ 0, (sy_call_t *)nosys },			/* 119 = resuba */
-	{ 3, (sy_call_t *)readv },			/* 120 = readv */
-	{ 3, (sy_call_t *)writev },			/* 121 = writev */
-	{ 2, (sy_call_t *)settimeofday },		/* 122 = settimeofday */
-	{ 3, (sy_call_t *)fchown },			/* 123 = fchown */
-	{ 2, (sy_call_t *)fchmod },			/* 124 = fchmod */
-	{ compat(6,recvfrom) },		/* 125 = old recvfrom */
-	{ 2, (sy_call_t *)setreuid },			/* 126 = setreuid */
-	{ 2, (sy_call_t *)setregid },			/* 127 = setregid */
-	{ 2, (sy_call_t *)rename },			/* 128 = rename */
-	{ compat(2,truncate) },		/* 129 = old truncate */
-	{ compat(2,ftruncate) },		/* 130 = old ftruncate */
-	{ 2, (sy_call_t *)flock },			/* 131 = flock */
-	{ 2, (sy_call_t *)mkfifo },			/* 132 = mkfifo */
-	{ 6, (sy_call_t *)sendto },			/* 133 = sendto */
-	{ 2, (sy_call_t *)shutdown },			/* 134 = shutdown */
-	{ 4, (sy_call_t *)socketpair },			/* 135 = socketpair */
-	{ 2, (sy_call_t *)mkdir },			/* 136 = mkdir */
-	{ 1, (sy_call_t *)rmdir },			/* 137 = rmdir */
-	{ 2, (sy_call_t *)utimes },			/* 138 = utimes */
+	{ AS(readv_args), (sy_call_t *)readv },		/* 120 = readv */
+	{ AS(writev_args), (sy_call_t *)writev },	/* 121 = writev */
+	{ AS(settimeofday_args), (sy_call_t *)settimeofday },	/* 122 = settimeofday */
+	{ AS(fchown_args), (sy_call_t *)fchown },	/* 123 = fchown */
+	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 124 = fchmod */
+	{ compat(AS(recvfrom_args),recvfrom) },		/* 125 = old recvfrom */
+	{ AS(setreuid_args), (sy_call_t *)setreuid },	/* 126 = setreuid */
+	{ AS(setregid_args), (sy_call_t *)setregid },	/* 127 = setregid */
+	{ AS(rename_args), (sy_call_t *)rename },	/* 128 = rename */
+	{ compat(AS(otruncate_args),truncate) },	/* 129 = old truncate */
+	{ compat(AS(oftruncate_args),ftruncate) },	/* 130 = old ftruncate */
+	{ AS(flock_args), (sy_call_t *)flock },		/* 131 = flock */
+	{ AS(mkfifo_args), (sy_call_t *)mkfifo },	/* 132 = mkfifo */
+	{ AS(sendto_args), (sy_call_t *)sendto },	/* 133 = sendto */
+	{ AS(shutdown_args), (sy_call_t *)shutdown },	/* 134 = shutdown */
+	{ AS(socketpair_args), (sy_call_t *)socketpair },	/* 135 = socketpair */
+	{ AS(mkdir_args), (sy_call_t *)mkdir },		/* 136 = mkdir */
+	{ AS(rmdir_args), (sy_call_t *)rmdir },		/* 137 = rmdir */
+	{ AS(utimes_args), (sy_call_t *)utimes },	/* 138 = utimes */
 	{ 0, (sy_call_t *)nosys },			/* 139 = obsolete 4.2 sigreturn */
-	{ 2, (sy_call_t *)adjtime },			/* 140 = adjtime */
-	{ compat(3,getpeername) },		/* 141 = old getpeername */
-	{ compat(0,gethostid) },		/* 142 = old gethostid */
-	{ compat(1,sethostid) },		/* 143 = old sethostid */
-	{ compat(2,getrlimit) },		/* 144 = old getrlimit */
-	{ compat(2,setrlimit) },		/* 145 = old setrlimit */
-	{ compat(2,killpg) },		/* 146 = old killpg */
+	{ AS(adjtime_args), (sy_call_t *)adjtime },	/* 140 = adjtime */
+	{ compat(AS(ogetpeername_args),getpeername) },	/* 141 = old getpeername */
+	{ compat(0,gethostid) },			/* 142 = old gethostid */
+	{ compat(AS(osethostid_args),sethostid) },	/* 143 = old sethostid */
+	{ compat(AS(ogetrlimit_args),getrlimit) },	/* 144 = old getrlimit */
+	{ compat(AS(osetrlimit_args),setrlimit) },	/* 145 = old setrlimit */
+	{ compat(AS(okillpg_args),killpg) },		/* 146 = old killpg */
 	{ 0, (sy_call_t *)setsid },			/* 147 = setsid */
-	{ 4, (sy_call_t *)quotactl },			/* 148 = quotactl */
-	{ compat(0,quota) },		/* 149 = old quota */
-	{ compat(3,getsockname) },		/* 150 = old getsockname */
+	{ AS(quotactl_args), (sy_call_t *)quotactl },	/* 148 = quotactl */
+	{ compat(0,quota) },				/* 149 = old quota */
+	{ compat(AS(getsockname_args),getsockname) },	/* 150 = old getsockname */
 	{ 0, (sy_call_t *)nosys },			/* 151 = sem_lock */
 	{ 0, (sy_call_t *)nosys },			/* 152 = sem_wakeup */
 	{ 0, (sy_call_t *)nosys },			/* 153 = asyncdaemon */
 	{ 0, (sy_call_t *)nosys },			/* 154 = nosys */
-	{ 2, (sy_call_t *)nosys },			/* 155 = nfssvc */
-	{ compat(4,getdirentries) },		/* 156 = old getdirentries */
-	{ 2, (sy_call_t *)statfs },			/* 157 = statfs */
-	{ 2, (sy_call_t *)fstatfs },			/* 158 = fstatfs */
+	{ AS(nfssvc_args), (sy_call_t *)nosys },	/* 155 = nfssvc */
+	{ compat(AS(ogetdirentries_args),getdirentries) },	/* 156 = old getdirentries */
+	{ AS(statfs_args), (sy_call_t *)statfs },	/* 157 = statfs */
+	{ AS(fstatfs_args), (sy_call_t *)fstatfs },	/* 158 = fstatfs */
 	{ 0, (sy_call_t *)nosys },			/* 159 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 160 = nosys */
-	{ 2, (sy_call_t *)getfh },			/* 161 = getfh */
-	{ 2, (sy_call_t *)getdomainname },		/* 162 = getdomainname */
-	{ 2, (sy_call_t *)setdomainname },		/* 163 = setdomainname */
-	{ 1, (sy_call_t *)uname },			/* 164 = uname */
-	{ 2, (sy_call_t *)sysarch },			/* 165 = sysarch */
-	{ 3, (sy_call_t *)rtprio },			/* 166 = rtprio */
+	{ AS(getfh_args), (sy_call_t *)getfh },		/* 161 = getfh */
+	{ AS(getdomainname_args), (sy_call_t *)getdomainname },	/* 162 = getdomainname */
+	{ AS(setdomainname_args), (sy_call_t *)setdomainname },	/* 163 = setdomainname */
+	{ AS(uname_args), (sy_call_t *)uname },		/* 164 = uname */
+	{ AS(sysarch_args), (sy_call_t *)sysarch },	/* 165 = sysarch */
+	{ AS(rtprio_args), (sy_call_t *)rtprio },	/* 166 = rtprio */
 	{ 0, (sy_call_t *)nosys },			/* 167 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 168 = nosys */
-	{ 5, (sy_call_t *)semsys },			/* 169 = semsys */
-	{ 6, (sy_call_t *)msgsys },			/* 170 = msgsys */
-	{ 4, (sy_call_t *)shmsys },			/* 171 = shmsys */
+	{ AS(semsys_args), (sy_call_t *)semsys },	/* 169 = semsys */
+	{ AS(msgsys_args), (sy_call_t *)msgsys },	/* 170 = msgsys */
+	{ AS(shmsys_args), (sy_call_t *)shmsys },	/* 171 = shmsys */
 	{ 0, (sy_call_t *)nosys },			/* 172 = nosys */
-	{ 6, (sy_call_t *)pread },			/* 173 = pread */
-	{ 6, (sy_call_t *)pwrite },			/* 174 = pwrite */
+	{ AS(pread_args), (sy_call_t *)pread },		/* 173 = pread */
+	{ AS(pwrite_args), (sy_call_t *)pwrite },	/* 174 = pwrite */
 	{ 0, (sy_call_t *)nosys },			/* 175 = nosys */
-	{ 1, (sy_call_t *)ntp_adjtime },		/* 176 = ntp_adjtime */
+	{ AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime },	/* 176 = ntp_adjtime */
 	{ 0, (sy_call_t *)nosys },			/* 177 = sfork */
 	{ 0, (sy_call_t *)nosys },			/* 178 = getdescriptor */
 	{ 0, (sy_call_t *)nosys },			/* 179 = setdescriptor */
 	{ 0, (sy_call_t *)nosys },			/* 180 = nosys */
-	{ 1, (sy_call_t *)setgid },			/* 181 = setgid */
-	{ 1, (sy_call_t *)setegid },			/* 182 = setegid */
-	{ 1, (sy_call_t *)seteuid },			/* 183 = seteuid */
+	{ AS(setgid_args), (sy_call_t *)setgid },	/* 181 = setgid */
+	{ AS(setegid_args), (sy_call_t *)setegid },	/* 182 = setegid */
+	{ AS(seteuid_args), (sy_call_t *)seteuid },	/* 183 = seteuid */
 	{ 0, (sy_call_t *)nosys },			/* 184 = lfs_bmapv */
 	{ 0, (sy_call_t *)nosys },			/* 185 = lfs_markv */
 	{ 0, (sy_call_t *)nosys },			/* 186 = lfs_segclean */
 	{ 0, (sy_call_t *)nosys },			/* 187 = lfs_segwait */
-	{ 2, (sy_call_t *)stat },			/* 188 = stat */
-	{ 2, (sy_call_t *)fstat },			/* 189 = fstat */
-	{ 2, (sy_call_t *)lstat },			/* 190 = lstat */
-	{ 2, (sy_call_t *)pathconf },			/* 191 = pathconf */
-	{ 2, (sy_call_t *)fpathconf },			/* 192 = fpathconf */
+	{ AS(stat_args), (sy_call_t *)stat },		/* 188 = stat */
+	{ AS(fstat_args), (sy_call_t *)fstat },		/* 189 = fstat */
+	{ AS(lstat_args), (sy_call_t *)lstat },		/* 190 = lstat */
+	{ AS(pathconf_args), (sy_call_t *)pathconf },	/* 191 = pathconf */
+	{ AS(fpathconf_args), (sy_call_t *)fpathconf },	/* 192 = fpathconf */
 	{ 0, (sy_call_t *)nosys },			/* 193 = nosys */
-	{ 2, (sy_call_t *)getrlimit },			/* 194 = getrlimit */
-	{ 2, (sy_call_t *)setrlimit },			/* 195 = setrlimit */
-	{ 4, (sy_call_t *)getdirentries },		/* 196 = getdirentries */
-	{ 8, (sy_call_t *)mmap },			/* 197 = mmap */
+	{ AS(__getrlimit_args), (sy_call_t *)getrlimit },	/* 194 = getrlimit */
+	{ AS(__setrlimit_args), (sy_call_t *)setrlimit },	/* 195 = setrlimit */
+	{ AS(getdirentries_args), (sy_call_t *)getdirentries },	/* 196 = getdirentries */
+	{ AS(mmap_args), (sy_call_t *)mmap },		/* 197 = mmap */
 	{ 0, (sy_call_t *)nosys },			/* 198 = __syscall */
-	{ 5, (sy_call_t *)lseek },			/* 199 = lseek */
-	{ 4, (sy_call_t *)truncate },			/* 200 = truncate */
-	{ 4, (sy_call_t *)ftruncate },			/* 201 = ftruncate */
-	{ 6, (sy_call_t *)__sysctl },			/* 202 = __sysctl */
-	{ 2, (sy_call_t *)mlock },			/* 203 = mlock */
-	{ 2, (sy_call_t *)munlock },			/* 204 = munlock */
-	{ 1, (sy_call_t *)undelete },			/* 205 = undelete */
-	{ 2, (sy_call_t *)futimes },			/* 206 = futimes */
-	{ 1, (sy_call_t *)getpgid },			/* 207 = getpgid */
+	{ AS(lseek_args), (sy_call_t *)lseek },		/* 199 = lseek */
+	{ AS(truncate_args), (sy_call_t *)truncate },	/* 200 = truncate */
+	{ AS(ftruncate_args), (sy_call_t *)ftruncate },	/* 201 = ftruncate */
+	{ AS(sysctl_args), (sy_call_t *)__sysctl },	/* 202 = __sysctl */
+	{ AS(mlock_args), (sy_call_t *)mlock },		/* 203 = mlock */
+	{ AS(munlock_args), (sy_call_t *)munlock },	/* 204 = munlock */
+	{ AS(undelete_args), (sy_call_t *)undelete },	/* 205 = undelete */
+	{ AS(futimes_args), (sy_call_t *)futimes },	/* 206 = futimes */
+	{ AS(getpgid_args), (sy_call_t *)getpgid },	/* 207 = getpgid */
 	{ 0, (sy_call_t *)nosys },			/* 208 = newreboot */
-	{ 3, (sy_call_t *)poll },			/* 209 = poll */
+	{ AS(poll_args), (sy_call_t *)poll },		/* 209 = poll */
 	{ 0, (sy_call_t *)lkmnosys },			/* 210 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 211 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 212 = lkmnosys */
@@ -240,27 +242,27 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)lkmnosys },			/* 217 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 218 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 219 = lkmnosys */
-	{ 4, (sy_call_t *)__semctl },			/* 220 = __semctl */
-	{ 3, (sy_call_t *)semget },			/* 221 = semget */
-	{ 3, (sy_call_t *)semop },			/* 222 = semop */
+	{ AS(__semctl_args), (sy_call_t *)__semctl },	/* 220 = __semctl */
+	{ AS(semget_args), (sy_call_t *)semget },	/* 221 = semget */
+	{ AS(semop_args), (sy_call_t *)semop },		/* 222 = semop */
 	{ 0, (sy_call_t *)nosys },			/* 223 = semconfig */
-	{ 3, (sy_call_t *)msgctl },			/* 224 = msgctl */
-	{ 2, (sy_call_t *)msgget },			/* 225 = msgget */
-	{ 4, (sy_call_t *)msgsnd },			/* 226 = msgsnd */
-	{ 5, (sy_call_t *)msgrcv },			/* 227 = msgrcv */
-	{ 3, (sy_call_t *)shmat },			/* 228 = shmat */
-	{ 3, (sy_call_t *)shmctl },			/* 229 = shmctl */
-	{ 1, (sy_call_t *)shmdt },			/* 230 = shmdt */
-	{ 3, (sy_call_t *)shmget },			/* 231 = shmget */
-	{ 2, (sy_call_t *)clock_gettime },		/* 232 = clock_gettime */
-	{ 2, (sy_call_t *)clock_settime },		/* 233 = clock_settime */
-	{ 2, (sy_call_t *)clock_getres },		/* 234 = clock_getres */
+	{ AS(msgctl_args), (sy_call_t *)msgctl },	/* 224 = msgctl */
+	{ AS(msgget_args), (sy_call_t *)msgget },	/* 225 = msgget */
+	{ AS(msgsnd_args), (sy_call_t *)msgsnd },	/* 226 = msgsnd */
+	{ AS(msgrcv_args), (sy_call_t *)msgrcv },	/* 227 = msgrcv */
+	{ AS(shmat_args), (sy_call_t *)shmat },		/* 228 = shmat */
+	{ AS(shmctl_args), (sy_call_t *)shmctl },	/* 229 = shmctl */
+	{ AS(shmdt_args), (sy_call_t *)shmdt },		/* 230 = shmdt */
+	{ AS(shmget_args), (sy_call_t *)shmget },	/* 231 = shmget */
+	{ AS(clock_gettime_args), (sy_call_t *)clock_gettime },	/* 232 = clock_gettime */
+	{ AS(clock_settime_args), (sy_call_t *)clock_settime },	/* 233 = clock_settime */
+	{ AS(clock_getres_args), (sy_call_t *)clock_getres },	/* 234 = clock_getres */
 	{ 0, (sy_call_t *)nosys },			/* 235 = timer_create */
 	{ 0, (sy_call_t *)nosys },			/* 236 = timer_delete */
 	{ 0, (sy_call_t *)nosys },			/* 237 = timer_settime */
 	{ 0, (sy_call_t *)nosys },			/* 238 = timer_gettime */
 	{ 0, (sy_call_t *)nosys },			/* 239 = timer_getoverrun */
-	{ 2, (sy_call_t *)nanosleep },			/* 240 = nanosleep */
+	{ AS(nanosleep_args), (sy_call_t *)nanosleep },	/* 240 = nanosleep */
 	{ 0, (sy_call_t *)nosys },			/* 241 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 242 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 243 = nosys */
@@ -270,11 +272,11 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 247 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 248 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 249 = nosys */
-	{ 3, (sy_call_t *)minherit },			/* 250 = minherit */
-	{ 1, (sy_call_t *)rfork },			/* 251 = rfork */
-	{ 3, (sy_call_t *)openbsd_poll },		/* 252 = openbsd_poll */
+	{ AS(minherit_args), (sy_call_t *)minherit },	/* 250 = minherit */
+	{ AS(rfork_args), (sy_call_t *)rfork },		/* 251 = rfork */
+	{ AS(openbsd_poll_args), (sy_call_t *)openbsd_poll },	/* 252 = openbsd_poll */
 	{ 0, (sy_call_t *)issetugid },			/* 253 = issetugid */
-	{ 3, (sy_call_t *)lchown },			/* 254 = lchown */
+	{ AS(lchown_args), (sy_call_t *)lchown },	/* 254 = lchown */
 	{ 0, (sy_call_t *)nosys },			/* 255 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 256 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 257 = nosys */
@@ -292,15 +294,15 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 269 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 270 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 271 = nosys */
-	{ 3, (sy_call_t *)getdents },			/* 272 = getdents */
+	{ AS(getdents_args), (sy_call_t *)getdents },	/* 272 = getdents */
 	{ 0, (sy_call_t *)nosys },			/* 273 = nosys */
-	{ 2, (sy_call_t *)lchmod },			/* 274 = lchmod */
-	{ 3, (sy_call_t *)lchown },			/* 275 = netbsd_lchown */
-	{ 2, (sy_call_t *)lutimes },			/* 276 = lutimes */
-	{ 3, (sy_call_t *)msync },			/* 277 = netbsd_msync */
-	{ 2, (sy_call_t *)nstat },			/* 278 = nstat */
-	{ 2, (sy_call_t *)nfstat },			/* 279 = nfstat */
-	{ 2, (sy_call_t *)nlstat },			/* 280 = nlstat */
+	{ AS(lchmod_args), (sy_call_t *)lchmod },	/* 274 = lchmod */
+	{ AS(lchown_args), (sy_call_t *)lchown },	/* 275 = netbsd_lchown */
+	{ AS(lutimes_args), (sy_call_t *)lutimes },	/* 276 = lutimes */
+	{ AS(msync_args), (sy_call_t *)msync },		/* 277 = netbsd_msync */
+	{ AS(nstat_args), (sy_call_t *)nstat },		/* 278 = nstat */
+	{ AS(nfstat_args), (sy_call_t *)nfstat },	/* 279 = nfstat */
+	{ AS(nlstat_args), (sy_call_t *)nlstat },	/* 280 = nlstat */
 	{ 0, (sy_call_t *)nosys },			/* 281 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 282 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 283 = nosys */
@@ -317,71 +319,71 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 294 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 295 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 296 = nosys */
-	{ 2, (sy_call_t *)fhstatfs },			/* 297 = fhstatfs */
-	{ 2, (sy_call_t *)fhopen },			/* 298 = fhopen */
-	{ 2, (sy_call_t *)fhstat },			/* 299 = fhstat */
-	{ 1, (sy_call_t *)modnext },			/* 300 = modnext */
-	{ 2, (sy_call_t *)modstat },			/* 301 = modstat */
-	{ 1, (sy_call_t *)modfnext },			/* 302 = modfnext */
-	{ 1, (sy_call_t *)modfind },			/* 303 = modfind */
-	{ 1, (sy_call_t *)kldload },			/* 304 = kldload */
-	{ 1, (sy_call_t *)kldunload },			/* 305 = kldunload */
-	{ 1, (sy_call_t *)kldfind },			/* 306 = kldfind */
-	{ 1, (sy_call_t *)kldnext },			/* 307 = kldnext */
-	{ 2, (sy_call_t *)kldstat },			/* 308 = kldstat */
-	{ 1, (sy_call_t *)kldfirstmod },		/* 309 = kldfirstmod */
-	{ 1, (sy_call_t *)getsid },			/* 310 = getsid */
-	{ 3, (sy_call_t *)setresuid },			/* 311 = setresuid */
-	{ 3, (sy_call_t *)setresgid },			/* 312 = setresgid */
+	{ AS(fhstatfs_args), (sy_call_t *)fhstatfs },	/* 297 = fhstatfs */
+	{ AS(fhopen_args), (sy_call_t *)fhopen },	/* 298 = fhopen */
+	{ AS(fhstat_args), (sy_call_t *)fhstat },	/* 299 = fhstat */
+	{ AS(modnext_args), (sy_call_t *)modnext },	/* 300 = modnext */
+	{ AS(modstat_args), (sy_call_t *)modstat },	/* 301 = modstat */
+	{ AS(modfnext_args), (sy_call_t *)modfnext },	/* 302 = modfnext */
+	{ AS(modfind_args), (sy_call_t *)modfind },	/* 303 = modfind */
+	{ AS(kldload_args), (sy_call_t *)kldload },	/* 304 = kldload */
+	{ AS(kldunload_args), (sy_call_t *)kldunload },	/* 305 = kldunload */
+	{ AS(kldfind_args), (sy_call_t *)kldfind },	/* 306 = kldfind */
+	{ AS(kldnext_args), (sy_call_t *)kldnext },	/* 307 = kldnext */
+	{ AS(kldstat_args), (sy_call_t *)kldstat },	/* 308 = kldstat */
+	{ AS(kldfirstmod_args), (sy_call_t *)kldfirstmod },	/* 309 = kldfirstmod */
+	{ AS(getsid_args), (sy_call_t *)getsid },	/* 310 = getsid */
+	{ AS(setresuid_args), (sy_call_t *)setresuid },	/* 311 = setresuid */
+	{ AS(setresgid_args), (sy_call_t *)setresgid },	/* 312 = setresgid */
 	{ 0, (sy_call_t *)nosys },			/* 313 = obsolete signanosleep */
-	{ 1, (sy_call_t *)aio_return },			/* 314 = aio_return */
-	{ 3, (sy_call_t *)aio_suspend },		/* 315 = aio_suspend */
-	{ 2, (sy_call_t *)aio_cancel },			/* 316 = aio_cancel */
-	{ 1, (sy_call_t *)aio_error },			/* 317 = aio_error */
-	{ 1, (sy_call_t *)aio_read },			/* 318 = aio_read */
-	{ 1, (sy_call_t *)aio_write },			/* 319 = aio_write */
-	{ 4, (sy_call_t *)lio_listio },			/* 320 = lio_listio */
+	{ AS(aio_return_args), (sy_call_t *)aio_return },	/* 314 = aio_return */
+	{ AS(aio_suspend_args), (sy_call_t *)aio_suspend },	/* 315 = aio_suspend */
+	{ AS(aio_cancel_args), (sy_call_t *)aio_cancel },	/* 316 = aio_cancel */
+	{ AS(aio_error_args), (sy_call_t *)aio_error },	/* 317 = aio_error */
+	{ AS(aio_read_args), (sy_call_t *)aio_read },	/* 318 = aio_read */
+	{ AS(aio_write_args), (sy_call_t *)aio_write },	/* 319 = aio_write */
+	{ AS(lio_listio_args), (sy_call_t *)lio_listio },	/* 320 = lio_listio */
 	{ 0, (sy_call_t *)yield },			/* 321 = yield */
-	{ 1, (sy_call_t *)thr_sleep },			/* 322 = thr_sleep */
-	{ 1, (sy_call_t *)thr_wakeup },			/* 323 = thr_wakeup */
-	{ 1, (sy_call_t *)mlockall },			/* 324 = mlockall */
+	{ AS(thr_sleep_args), (sy_call_t *)thr_sleep },	/* 322 = thr_sleep */
+	{ AS(thr_wakeup_args), (sy_call_t *)thr_wakeup },	/* 323 = thr_wakeup */
+	{ AS(mlockall_args), (sy_call_t *)mlockall },	/* 324 = mlockall */
 	{ 0, (sy_call_t *)munlockall },			/* 325 = munlockall */
-	{ 2, (sy_call_t *)__getcwd },			/* 326 = __getcwd */
-	{ 2, (sy_call_t *)sched_setparam },		/* 327 = sched_setparam */
-	{ 2, (sy_call_t *)sched_getparam },		/* 328 = sched_getparam */
-	{ 3, (sy_call_t *)sched_setscheduler },		/* 329 = sched_setscheduler */
-	{ 1, (sy_call_t *)sched_getscheduler },		/* 330 = sched_getscheduler */
+	{ AS(__getcwd_args), (sy_call_t *)__getcwd },	/* 326 = __getcwd */
+	{ AS(sched_setparam_args), (sy_call_t *)sched_setparam },	/* 327 = sched_setparam */
+	{ AS(sched_getparam_args), (sy_call_t *)sched_getparam },	/* 328 = sched_getparam */
+	{ AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler },	/* 329 = sched_setscheduler */
+	{ AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler },	/* 330 = sched_getscheduler */
 	{ 0, (sy_call_t *)sched_yield },		/* 331 = sched_yield */
-	{ 1, (sy_call_t *)sched_get_priority_max },		/* 332 = sched_get_priority_max */
-	{ 1, (sy_call_t *)sched_get_priority_min },		/* 333 = sched_get_priority_min */
-	{ 2, (sy_call_t *)sched_rr_get_interval },		/* 334 = sched_rr_get_interval */
-	{ 2, (sy_call_t *)utrace },			/* 335 = utrace */
-	{ 8, (sy_call_t *)sendfile },			/* 336 = sendfile */
-	{ 3, (sy_call_t *)kldsym },			/* 337 = kldsym */
-	{ 1, (sy_call_t *)jail },			/* 338 = jail */
+	{ AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max },	/* 332 = sched_get_priority_max */
+	{ AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min },	/* 333 = sched_get_priority_min */
+	{ AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval },	/* 334 = sched_rr_get_interval */
+	{ AS(utrace_args), (sy_call_t *)utrace },	/* 335 = utrace */
+	{ AS(sendfile_args), (sy_call_t *)sendfile },	/* 336 = sendfile */
+	{ AS(kldsym_args), (sy_call_t *)kldsym },	/* 337 = kldsym */
+	{ AS(jail_args), (sy_call_t *)jail },		/* 338 = jail */
 	{ 0, (sy_call_t *)nosys },			/* 339 = pioctl */
-	{ SYF_MPSAFE | 3, (sy_call_t *)sigprocmask },	/* 340 = sigprocmask */
-	{ 1, (sy_call_t *)sigsuspend },			/* 341 = sigsuspend */
-	{ 3, (sy_call_t *)sigaction },			/* 342 = sigaction */
-	{ 1, (sy_call_t *)sigpending },			/* 343 = sigpending */
-	{ 1, (sy_call_t *)sigreturn },			/* 344 = sigreturn */
+	{ SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask },	/* 340 = sigprocmask */
+	{ AS(sigsuspend_args), (sy_call_t *)sigsuspend },	/* 341 = sigsuspend */
+	{ AS(sigaction_args), (sy_call_t *)sigaction },	/* 342 = sigaction */
+	{ AS(sigpending_args), (sy_call_t *)sigpending },	/* 343 = sigpending */
+	{ AS(sigreturn_args), (sy_call_t *)sigreturn },	/* 344 = sigreturn */
 	{ 0, (sy_call_t *)nosys },			/* 345 = sigtimedwait */
 	{ 0, (sy_call_t *)nosys },			/* 346 = sigwaitinfo */
-	{ 3, (sy_call_t *)__acl_get_file },		/* 347 = __acl_get_file */
-	{ 3, (sy_call_t *)__acl_set_file },		/* 348 = __acl_set_file */
-	{ 3, (sy_call_t *)__acl_get_fd },		/* 349 = __acl_get_fd */
-	{ 3, (sy_call_t *)__acl_set_fd },		/* 350 = __acl_set_fd */
-	{ 2, (sy_call_t *)__acl_delete_file },		/* 351 = __acl_delete_file */
-	{ 2, (sy_call_t *)__acl_delete_fd },		/* 352 = __acl_delete_fd */
-	{ 3, (sy_call_t *)__acl_aclcheck_file },		/* 353 = __acl_aclcheck_file */
-	{ 3, (sy_call_t *)__acl_aclcheck_fd },		/* 354 = __acl_aclcheck_fd */
-	{ 4, (sy_call_t *)extattrctl },			/* 355 = extattrctl */
-	{ 4, (sy_call_t *)extattr_set_file },		/* 356 = extattr_set_file */
-	{ 4, (sy_call_t *)extattr_get_file },		/* 357 = extattr_get_file */
-	{ 2, (sy_call_t *)extattr_delete_file },		/* 358 = extattr_delete_file */
-	{ 2, (sy_call_t *)aio_waitcomplete },		/* 359 = aio_waitcomplete */
-	{ 3, (sy_call_t *)getresuid },			/* 360 = getresuid */
-	{ 3, (sy_call_t *)getresgid },			/* 361 = getresgid */
+	{ AS(__acl_get_file_args), (sy_call_t *)__acl_get_file },	/* 347 = __acl_get_file */
+	{ AS(__acl_set_file_args), (sy_call_t *)__acl_set_file },	/* 348 = __acl_set_file */
+	{ AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd },	/* 349 = __acl_get_fd */
+	{ AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd },	/* 350 = __acl_set_fd */
+	{ AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file },	/* 351 = __acl_delete_file */
+	{ AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd },	/* 352 = __acl_delete_fd */
+	{ AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file },	/* 353 = __acl_aclcheck_file */
+	{ AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd },	/* 354 = __acl_aclcheck_fd */
+	{ AS(extattrctl_args), (sy_call_t *)extattrctl },	/* 355 = extattrctl */
+	{ AS(extattr_set_file_args), (sy_call_t *)extattr_set_file },	/* 356 = extattr_set_file */
+	{ AS(extattr_get_file_args), (sy_call_t *)extattr_get_file },	/* 357 = extattr_get_file */
+	{ AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file },	/* 358 = extattr_delete_file */
+	{ AS(aio_waitcomplete_args), (sy_call_t *)aio_waitcomplete },	/* 359 = aio_waitcomplete */
+	{ AS(getresuid_args), (sy_call_t *)getresuid },	/* 360 = getresuid */
+	{ AS(getresgid_args), (sy_call_t *)getresgid },	/* 361 = getresgid */
 	{ 0, (sy_call_t *)kqueue },			/* 362 = kqueue */
-	{ 6, (sy_call_t *)kevent },			/* 363 = kevent */
+	{ AS(kevent_args), (sy_call_t *)kevent },	/* 363 = kevent */
 };