X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/21362eb3e66fd2c787aee132bce100a44d71a99c..c6bf4f310a33a9262d455ea4d3f0630b1255e3fe:/bsd/kern/syscalls.master?ds=sidebyside

diff --git a/bsd/kern/syscalls.master b/bsd/kern/syscalls.master
index a051ba6cf..6878545e7 100644
--- a/bsd/kern/syscalls.master
+++ b/bsd/kern/syscalls.master
@@ -6,19 +6,30 @@
 ;	.../xnu/bsd/kern/syscalls.c 
 ;	.../xnu/bsd/sys/syscall.h 
 ;	.../xnu/bsd/sys/sysproto.h 
+;	.../xnu/bsd/security/audit_syscalls.c
 
-; Columns -> | Number | Cancel | Funnel | Files | { Name and Args } | { Comments }
+; Columns -> | Number Audit Files | { Name and Args } | { Comments }
 ;	Number:  	system call number, must be in order
-;	Cancel:  	type of thread cancel - "PRE", "POST" or "NONE"
-;	Funnel:  	type of funnel - "KERN" or  "NONE"
+;	Audit:		the audit event associated with the system call
+;			A value of AUE_NULL means no auditing, but it also means that
+;			there is no audit event for the call at this time. For the
+;			case where the event exists, but we don't want auditing, the
+;			event should be #defined to AUE_NULL in audit_kevents.h.
 ;	Files:		with files to generate - "ALL" or any combo of:
 ;					"T" for syscall table (in init_sysent.c)
 ;					"N" for syscall names (in syscalls.c)
 ;					"H" for syscall headers (in syscall.h)
 ;					"P" for syscall prototypes (in sysproto.h)
+;	Name and Args:	function prototype, optionally followed by
+;			NO_SYSCALL_STUB (which mean no system call stub will
+;			be generated in libSystem) and ending with a semicolon.
+;			(Note: functions prefixed by double-underbar are
+;			automatically given the NO_SYSCALL_STUB attribute.)
 ;	Comments:  	additional comments about the sys call copied to output files
 
 ; #ifdef's, #include's, #if's etc. are copied to all output files.
+; N.B.: makesyscalls.sh and createsyscalls.pl must be updated to account
+; for any new argument types.
 
 #include <sys/appleapiopts.h>
 #include <sys/param.h>
@@ -27,448 +38,814 @@
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 
-0	NONE	NONE	ALL	{ int nosys(void); }   { indirect syscall }
-1	NONE	KERN	ALL	{ void exit(int rval); } 
-2	NONE	KERN	ALL	{ int fork(void); } 
-3	PRE 	NONE	ALL	{ user_ssize_t read(int fd, user_addr_t cbuf, user_size_t nbyte); } 
-4	PRE 	NONE	ALL	{ user_ssize_t write(int fd, user_addr_t cbuf, user_size_t nbyte); } 
-5	PRE 	NONE	ALL	{ int open(user_addr_t path, int flags, int mode); } 
-6	PRE 	NONE	ALL	{ int close(int fd); } 
-7	PRE 	KERN	ALL	{ int wait4(int pid, user_addr_t status, int options, user_addr_t rusage); } 
-8	NONE	NONE	ALL	{ int nosys(void); }   { old creat }
-9	NONE	NONE	ALL	{ int link(user_addr_t path, user_addr_t link); } 
-10	NONE	NONE    ALL	{ int unlink(user_addr_t path); } 
-11	NONE	NONE	ALL	{ int nosys(void); }   { old execv }
-12	NONE	NONE	ALL	{ int chdir(user_addr_t path); } 
-13	NONE	NONE	ALL	{ int fchdir(int fd); } 
-14	NONE	NONE	ALL	{ int mknod(user_addr_t path, int mode, int dev); } 
-15	NONE	NONE	ALL	{ int chmod(user_addr_t path, int mode); } 
-16	NONE	NONE	ALL	{ int chown(user_addr_t path, int uid, int gid); } 
-17	NONE	NONE	UALL	{ int obreak(char *nsize); }   { old break }
-
-#if COMPAT_GETFSSTAT
-18	NONE	NONE	ALL	{ int ogetfsstat(user_addr_t buf, int bufsize, int flags); } 
+0	AUE_NULL	ALL	{ int nosys(void); }   { indirect syscall }
+1	AUE_EXIT	ALL	{ void exit(int rval) NO_SYSCALL_STUB; } 
+2	AUE_FORK	ALL	{ int fork(void) NO_SYSCALL_STUB; } 
+3	AUE_NULL	ALL	{ user_ssize_t read(int fd, user_addr_t cbuf, user_size_t nbyte); } 
+4	AUE_NULL	ALL	{ user_ssize_t write(int fd, user_addr_t cbuf, user_size_t nbyte); } 
+5	AUE_OPEN_RWTC	ALL	{ int open(user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; } 
+6	AUE_CLOSE	ALL	{ int close(int fd); } 
+7	AUE_WAIT4	ALL	{ int wait4(int pid, user_addr_t status, int options, user_addr_t rusage) NO_SYSCALL_STUB; } 
+8	AUE_NULL	ALL	{ int enosys(void); }   { old creat }
+9	AUE_LINK	ALL	{ int link(user_addr_t path, user_addr_t link); } 
+10	AUE_UNLINK	ALL	{ int unlink(user_addr_t path) NO_SYSCALL_STUB; } 
+11	AUE_NULL	ALL	{ int enosys(void); }   { old execv }
+12	AUE_CHDIR	ALL	{ int chdir(user_addr_t path); } 
+13	AUE_FCHDIR	ALL	{ int fchdir(int fd); } 
+14	AUE_MKNOD	ALL	{ int mknod(user_addr_t path, int mode, int dev); } 
+15	AUE_CHMOD	ALL	{ int chmod(user_addr_t path, int mode) NO_SYSCALL_STUB; } 
+16	AUE_CHOWN	ALL	{ int chown(user_addr_t path, int uid, int gid); } 
+17	AUE_NULL	ALL	{ int enosys(void); }   { old break }
+18	AUE_GETFSSTAT	ALL	{ int getfsstat(user_addr_t buf, int bufsize, int flags); } 
+19	AUE_NULL	ALL	{ int enosys(void); }   { old lseek }
+20	AUE_GETPID	ALL	{ int getpid(void); } 
+21	AUE_NULL	ALL	{ int enosys(void); }   { old mount }
+22	AUE_NULL	ALL	{ int enosys(void); }   { old umount }
+23	AUE_SETUID	ALL	{ int setuid(uid_t uid); } 
+24	AUE_GETUID	ALL	{ int getuid(void); } 
+25	AUE_GETEUID	ALL	{ int geteuid(void); } 
+26	AUE_PTRACE	ALL	{ int ptrace(int req, pid_t pid, caddr_t addr, int data); } 
+#if SOCKETS
+27	AUE_RECVMSG	ALL	{ int recvmsg(int s, struct msghdr *msg, int flags) NO_SYSCALL_STUB; } 
+28	AUE_SENDMSG	ALL	{ int sendmsg(int s, caddr_t msg, int flags) NO_SYSCALL_STUB; } 
+29	AUE_RECVFROM	ALL	{ int recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr) NO_SYSCALL_STUB; } 
+30	AUE_ACCEPT	ALL	{ int accept(int s, caddr_t name, socklen_t	*anamelen) NO_SYSCALL_STUB; } 
+31	AUE_GETPEERNAME	ALL	{ int getpeername(int fdes, caddr_t asa, socklen_t *alen) NO_SYSCALL_STUB; } 
+32	AUE_GETSOCKNAME	ALL	{ int getsockname(int fdes, caddr_t asa, socklen_t *alen) NO_SYSCALL_STUB; } 
 #else
-18	NONE	NONE	ALL	{ int getfsstat(user_addr_t buf, int bufsize, int flags); } 
-#endif
-
-19	NONE	NONE	ALL	{ int nosys(void); }   { old lseek }
-20	NONE	NONE	ALL	{ int getpid(void); } 
-21	NONE	NONE	ALL	{ int nosys(void); }   { old mount }
-22	NONE	NONE	ALL	{ int nosys(void); }   { old umount }
-23	NONE	KERN	ALL	{ int setuid(uid_t uid); } 
-24	NONE	KERN	ALL	{ int getuid(void); } 
-25	NONE	KERN	ALL	{ int geteuid(void); } 
-26	NONE	KERN	ALL	{ int ptrace(int req, pid_t pid, caddr_t addr, int data); } 
-27	PRE 	NONE	ALL	{ int recvmsg(int s, struct msghdr *msg, int flags); } 
-28	PRE 	NONE	ALL	{ int sendmsg(int s, caddr_t msg, int flags); } 
-29	PRE 	NONE	ALL	{ int recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr); } 
-30	PRE 	NONE	ALL	{ int accept(int s, caddr_t name, socklen_t	*anamelen); } 
-31	NONE	NONE	ALL	{ int getpeername(int fdes, caddr_t asa, socklen_t *alen); } 
-32	NONE	NONE	ALL	{ int getsockname(int fdes, caddr_t asa, socklen_t *alen); } 
-33	NONE	NONE	ALL	{ int access(user_addr_t path, int flags); } 
-34	NONE	NONE	ALL	{ int chflags(char *path, int flags); } 
-35	NONE	NONE	ALL	{ int fchflags(int fd, int flags); } 
-36	NONE	NONE	ALL	{ int sync(void); } 
-37	NONE	KERN	ALL	{ int kill(int pid, int signum); } 
-38	NONE	NONE	ALL	{ int nosys(void); }   { old stat  }
-39	NONE	KERN	ALL	{ int getppid(void); } 
-40	NONE	NONE	ALL	{ int nosys(void); }   { old lstat }
-41	NONE	NONE	ALL	{ int dup(u_int fd); } 
-42	NONE	NONE	ALL	{ int pipe(void); } 
-43	NONE	KERN	ALL	{ int getegid(void); } 
-44	NONE	KERN	ALL	{ int profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); } 
-45	NONE	KERN	ALL	{ int ktrace(const char *fname, int ops, int facs, int pid); } 
-46	NONE	KERN	ALL	{ int sigaction(int signum, struct __sigaction *nsa, struct sigaction *osa); } 
-47	NONE	KERN	ALL	{ int getgid(void); } 
-48	NONE	KERN	ALL	{ int sigprocmask(int how, user_addr_t mask, user_addr_t omask); } 
-49	NONE	KERN	ALL	{ int getlogin(char *namebuf, u_int namelen); } 
-50	NONE	KERN	ALL	{ int setlogin(char *namebuf); } 
-51	NONE	KERN	ALL	{ int acct(char *path); } 
-52	NONE	KERN	ALL	{ int sigpending(struct sigvec *osv); } 
-53	NONE	KERN	ALL	{ int sigaltstack(struct sigaltstack *nss, struct sigaltstack *oss); } 
-54	NONE	NONE	ALL	{ int ioctl(int fd, u_long com, caddr_t data); } 
-55	NONE	KERN	ALL	{ int reboot(int opt, char *command); } 
-56	NONE	NONE	ALL	{ int revoke(char *path); } 
-57	NONE	NONE	ALL	{ int symlink(char *path, char *link); } 
-58	NONE	NONE	ALL	{ int readlink(char *path, char *buf, int count); } 
-59	NONE	KERN	ALL	{ int execve(char *fname, char **argp, char **envp); } 
-60	NONE	KERN	ALL	{ int umask(int newmask); } 
-61	NONE	KERN	ALL	{ int chroot(user_addr_t path); } 
-62	NONE	NONE	ALL	{ int nosys(void); }   { old fstat }
-63	NONE	NONE	ALL	{ int nosys(void); }   { used internally, reserved }
-64	NONE	NONE	ALL	{ int nosys(void); }   { old getpagesize }
-65	PRE 	NONE	ALL	{ int msync(caddr_t addr, size_t len, int flags); } 
-66	NONE	KERN	ALL	{ int vfork(void); } 
-67	NONE	NONE	ALL	{ int nosys(void); }   { old vread }
-68	NONE	NONE	ALL	{ int nosys(void); }   { old vwrite }
-69	NONE	NONE	ALL	{ int sbrk(int incr); } 
-70	NONE	NONE	ALL	{ int sstk(int incr); } 
-71	NONE	NONE	ALL	{ int nosys(void); }   { old mmap }
-72	NONE	NONE	ALL	{ int ovadvise(void); }   { old vadvise }
-73	NONE	NONE	ALL	{ int munmap(caddr_t addr, size_t len); } 
-74	NONE	NONE	ALL	{ int mprotect(caddr_t addr, size_t len, int prot); } 
-75	NONE	NONE	ALL	{ int madvise(caddr_t addr, size_t len, int behav); } 
-76	NONE	NONE	ALL	{ int nosys(void); }   { old vhangup }
-77	NONE	NONE	ALL	{ int nosys(void); }   { old vlimit }
-78	NONE	NONE	ALL	{ int mincore(user_addr_t addr, user_size_t len, user_addr_t vec); } 
-79	NONE	KERN	ALL	{ int getgroups(u_int gidsetsize, gid_t *gidset); } 
-80	NONE	KERN	ALL	{ int setgroups(u_int gidsetsize, gid_t *gidset); } 
-81	NONE	KERN	ALL	{ int getpgrp(void); } 
-82	NONE	KERN	ALL	{ int setpgid(int pid, int pgid); } 
-83	NONE	KERN	ALL	{ int setitimer(u_int which, struct itimerval *itv, struct itimerval *oitv); } 
-84	NONE	NONE	ALL	{ int nosys(void); }   { old wait }
-85	NONE	NONE	ALL	{ int swapon(void); } 
-86	NONE	KERN	ALL	{ int getitimer(u_int which, struct itimerval *itv); } 
-87	NONE	NONE	ALL	{ int nosys(void); }   { old gethostname }
-88	NONE	NONE	ALL	{ int nosys(void); }   { old sethostname }
-89	NONE	NONE	ALL	{ int getdtablesize(void); } 
-90	NONE	NONE	ALL	{ int dup2(u_int from, u_int to); } 
-91	NONE	NONE	ALL	{ int nosys(void); }   { old getdopt }
-92	PRE 	NONE	ALL	{ int fcntl(int fd, int cmd, long arg); } 
-93	PRE 	KERN	ALL	{ int select(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv); } 
-94	NONE	NONE	ALL	{ int nosys(void); }   { old setdopt }
-95	PRE 	NONE	ALL	{ int fsync(int fd); } 
-96	NONE	KERN	ALL	{ int setpriority(int which, int who, int prio); } 
-97	NONE	NONE	ALL	{ int socket(int domain, int type, int protocol); } 
-98	PRE 	NONE	ALL	{ int connect(int s, caddr_t name, socklen_t namelen); } 
-99	NONE	NONE	ALL	{ int nosys(void); }   { old accept }
-100	NONE	KERN	ALL	{ int getpriority(int which, int who); } 
-101	NONE	NONE	ALL	{ int nosys(void); }   { old send }
-102	NONE	NONE	ALL	{ int nosys(void); }   { old recv }
-
-#ifdef __ppc__
-103	NONE	NONE	ALL	{ int nosys(void); }   { old sigreturn }
+27	AUE_NULL	ALL	{ int nosys(void); }
+28	AUE_NULL	ALL	{ int nosys(void); }
+29	AUE_NULL	ALL	{ int nosys(void); }
+30	AUE_NULL	ALL	{ int nosys(void); }
+31	AUE_NULL	ALL	{ int nosys(void); }
+32	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+33	AUE_ACCESS	ALL	{ int access(user_addr_t path, int flags); } 
+34	AUE_CHFLAGS	ALL	{ int chflags(char *path, int flags); } 
+35	AUE_FCHFLAGS	ALL	{ int fchflags(int fd, int flags); } 
+36	AUE_SYNC	ALL	{ int sync(void); } 
+37	AUE_KILL	ALL	{ int kill(int pid, int signum, int posix) NO_SYSCALL_STUB; } 
+38	AUE_NULL	ALL	{ int nosys(void); }   { old stat  }
+39	AUE_GETPPID	ALL	{ int getppid(void); } 
+40	AUE_NULL	ALL	{ int nosys(void); }   { old lstat }
+41	AUE_DUP		ALL	{ int dup(u_int fd); } 
+42	AUE_PIPE	ALL	{ int pipe(void); } 
+43	AUE_GETEGID	ALL	{ int getegid(void); } 
+44	AUE_NULL	ALL	{ int nosys(void); } { old profil }
+45	AUE_NULL	ALL	{ int nosys(void); } { old ktrace }
+46	AUE_SIGACTION	ALL	{ int sigaction(int signum, struct __sigaction *nsa, struct sigaction *osa) NO_SYSCALL_STUB; } 
+47	AUE_GETGID	ALL	{ int getgid(void); } 
+48	AUE_SIGPROCMASK	ALL	{ int sigprocmask(int how, user_addr_t mask, user_addr_t omask); } 
+49	AUE_GETLOGIN	ALL	{ int getlogin(char *namebuf, u_int namelen) NO_SYSCALL_STUB; } 
+50	AUE_SETLOGIN	ALL	{ int setlogin(char *namebuf) NO_SYSCALL_STUB; } 
+51	AUE_ACCT	ALL	{ int acct(char *path); } 
+52	AUE_SIGPENDING	ALL	{ int sigpending(struct sigvec *osv); } 
+53	AUE_SIGALTSTACK	ALL	{ int sigaltstack(struct sigaltstack *nss, struct sigaltstack *oss) NO_SYSCALL_STUB ; } 
+54	AUE_IOCTL	ALL	{ int ioctl(int fd, u_long com, caddr_t data) NO_SYSCALL_STUB; } 
+55	AUE_REBOOT	ALL	{ int reboot(int opt, char *msg) NO_SYSCALL_STUB; }
+56	AUE_REVOKE	ALL	{ int revoke(char *path); } 
+57	AUE_SYMLINK	ALL	{ int symlink(char *path, char *link); } 
+58	AUE_READLINK	ALL	{ int readlink(char *path, char *buf, int count); } 
+59	AUE_EXECVE	ALL	{ int execve(char *fname, char **argp, char **envp); } 
+60	AUE_UMASK	ALL	{ int umask(int newmask); } 
+61	AUE_CHROOT	ALL	{ int chroot(user_addr_t path); } 
+62	AUE_NULL	ALL	{ int nosys(void); }   { old fstat }
+63	AUE_NULL	ALL	{ int nosys(void); }   { used internally and reserved }
+64	AUE_NULL	ALL	{ int nosys(void); }   { old getpagesize }
+65	AUE_MSYNC	ALL	{ int msync(caddr_t addr, size_t len, int flags) NO_SYSCALL_STUB; } 
+66	AUE_VFORK	ALL	{ int vfork(void); } 
+67	AUE_NULL	ALL	{ int nosys(void); }   { old vread }
+68	AUE_NULL	ALL	{ int nosys(void); }   { old vwrite }
+69	AUE_NULL	ALL	{ int nosys(void); }   { old sbrk }
+70	AUE_NULL	ALL	{ int nosys(void); }   { old sstk } 
+71	AUE_NULL	ALL	{ int nosys(void); }   { old mmap }
+72	AUE_NULL	ALL	{ int nosys(void); }   { old vadvise }
+73	AUE_MUNMAP	ALL	{ int munmap(caddr_t addr, size_t len) NO_SYSCALL_STUB; } 
+74	AUE_MPROTECT	ALL	{ int mprotect(caddr_t addr, size_t len, int prot) NO_SYSCALL_STUB; } 
+75	AUE_MADVISE	ALL	{ int madvise(caddr_t addr, size_t len, int behav); } 
+76	AUE_NULL	ALL	{ int nosys(void); }   { old vhangup }
+77	AUE_NULL	ALL	{ int nosys(void); }   { old vlimit }
+78	AUE_MINCORE	ALL	{ int mincore(user_addr_t addr, user_size_t len, user_addr_t vec); } 
+79	AUE_GETGROUPS	ALL	{ int getgroups(u_int gidsetsize, gid_t *gidset); } 
+80	AUE_SETGROUPS	ALL	{ int setgroups(u_int gidsetsize, gid_t *gidset); } 
+81	AUE_GETPGRP	ALL	{ int getpgrp(void); } 
+82	AUE_SETPGRP	ALL	{ int setpgid(int pid, int pgid); } 
+83	AUE_SETITIMER	ALL	{ int setitimer(u_int which, struct itimerval *itv, struct itimerval *oitv); } 
+84	AUE_NULL	ALL	{ int nosys(void); }   { old wait }
+85	AUE_SWAPON 	ALL	{ int swapon(void); } 
+86	AUE_GETITIMER	ALL	{ int getitimer(u_int which, struct itimerval *itv); } 
+87	AUE_NULL	ALL	{ int nosys(void); }   { old gethostname }
+88	AUE_NULL	ALL	{ int nosys(void); }   { old sethostname }
+89	AUE_GETDTABLESIZE	ALL	{ int getdtablesize(void); } 
+90	AUE_DUP2	ALL	{ int dup2(u_int from, u_int to); } 
+91	AUE_NULL	ALL	{ int nosys(void); }   { old getdopt }
+92	AUE_FCNTL	ALL	{ int fcntl(int fd, int cmd, long arg) NO_SYSCALL_STUB; } 
+93	AUE_SELECT	ALL	{ int select(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv) NO_SYSCALL_STUB; } 
+94	AUE_NULL	ALL	{ int nosys(void); }   { old setdopt }
+95	AUE_FSYNC	ALL	{ int fsync(int fd); } 
+96	AUE_SETPRIORITY	ALL	{ int setpriority(int which, id_t who, int prio) NO_SYSCALL_STUB; }
+#if SOCKETS
+97	AUE_SOCKET	ALL	{ int socket(int domain, int type, int protocol); } 
+98	AUE_CONNECT	ALL	{ int connect(int s, caddr_t name, socklen_t namelen) NO_SYSCALL_STUB; } 
 #else
-103	NONE	KERN	UALL	{ int sigreturn(struct sigcontext *sigcntxp); } 
-#endif
-
-104	NONE	NONE	ALL	{ int bind(int s, caddr_t name, socklen_t namelen); } 
-105	NONE	NONE	ALL	{ int setsockopt(int s, int level, int name, caddr_t val, socklen_t valsize); } 
-106	NONE	NONE	ALL	{ int listen(int s, int backlog); } 
-107	NONE	NONE	ALL	{ int nosys(void); }   { old vtimes }
-108	NONE	NONE	ALL	{ int nosys(void); }   { old sigvec }
-109	NONE	NONE	ALL	{ int nosys(void); }   { old sigblock }
-110	NONE	NONE	ALL	{ int nosys(void); }   { old sigsetmask }
-111	PRE 	KERN	ALL	{ int sigsuspend(sigset_t mask); } 
-112	NONE	NONE	ALL	{ int nosys(void); }   { old sigstack }
-113	NONE	NONE	ALL	{ int nosys(void); }   { old recvmsg }
-114	NONE	NONE	ALL	{ int nosys(void); }   { old sendmsg }	
-115	NONE	NONE	ALL	{ int nosys(void); }   { old vtrace }
-
-#ifdef __ppc__
-116	NONE	NONE	ALL	{ int ppc_gettimeofday(struct timeval *tp, struct timezone *tzp); } 
+97	AUE_NULL	ALL	{ int nosys(void); }
+98	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+99	AUE_NULL	ALL	{ int nosys(void); }   { old accept }
+100	AUE_GETPRIORITY	ALL	{ int getpriority(int which, id_t who); } 
+101	AUE_NULL	ALL	{ int nosys(void); }   { old send }
+102	AUE_NULL	ALL	{ int nosys(void); }   { old recv }
+103	AUE_NULL	ALL	{ int nosys(void); }   { old sigreturn }
+#if SOCKETS
+104	AUE_BIND	ALL	{ int bind(int s, caddr_t name, socklen_t namelen) NO_SYSCALL_STUB; } 
+105	AUE_SETSOCKOPT	ALL	{ int setsockopt(int s, int level, int name, caddr_t val, socklen_t valsize); } 
+106	AUE_LISTEN	ALL	{ int listen(int s, int backlog) NO_SYSCALL_STUB; } 
 #else
-116	NONE	NONE	ALL	{ int gettimeofday(struct timeval *tp, struct timezone *tzp); } 
-#endif
-
-117	NONE	KERN	ALL	{ int getrusage(int who, struct rusage *rusage); } 
-118	NONE	NONE	ALL	{ int getsockopt(int s, int level, int name, caddr_t val, socklen_t *avalsize); } 
-119	NONE	NONE	ALL	{ int nosys(void); }   { old resuba }
-120	PRE 	NONE	ALL	{ user_ssize_t readv(int fd, struct iovec *iovp, u_int iovcnt); } 
-121	PRE 	NONE	ALL	{ user_ssize_t writev(int fd, struct iovec *iovp, u_int iovcnt); } 
-122	NONE	KERN	ALL	{ int settimeofday(struct timeval *tv, struct timezone *tzp); } 
-123	NONE	NONE	ALL	{ int fchown(int fd, int uid, int gid); } 
-124	NONE	NONE	ALL	{ int fchmod(int fd, int mode); } 
-125	NONE	NONE	ALL	{ int nosys(void); }   { old recvfrom }
-126	NONE	NONE	ALL	{ int nosys(void); }   { old setreuid }
-127	NONE	NONE	ALL	{ int nosys(void); }   { old setregid }
-128	NONE	NONE	ALL	{ int rename(char *from, char *to); } 
-129	NONE	NONE	ALL	{ int nosys(void); }   { old truncate }
-130	NONE	NONE	ALL	{ int nosys(void); }   { old ftruncate }
-131	NONE	NONE	ALL	{ int flock(int fd, int how); } 
-132	NONE	NONE	ALL	{ int mkfifo(user_addr_t path, int mode); } 
-133	PRE 	NONE	ALL	{ int sendto(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen); } 
-134	NONE	NONE	ALL	{ int shutdown(int s, int how); } 
-135	NONE	NONE	ALL	{ int socketpair(int domain, int type, int protocol, int *rsv); } 
-136	NONE	NONE	ALL	{ int mkdir(user_addr_t path, int mode); } 
-137	NONE	NONE	ALL	{ int rmdir(char *path); } 
-138	NONE	NONE	ALL	{ int utimes(char *path, struct timeval *tptr); } 
-139	NONE	NONE	ALL	{ int futimes(int fd, struct timeval *tptr); } 
-140	NONE	KERN	ALL	{ int adjtime(struct timeval *delta, struct timeval *olddelta); } 
-141	NONE	NONE	ALL	{ int nosys(void); }   { old getpeername }
-142	NONE	NONE	ALL	{ int nosys(void); }   { old gethostid }
-143	NONE	NONE	ALL	{ int nosys(void); }   { old sethostid 	}
-144	NONE	NONE	ALL	{ int nosys(void); }   { old getrlimit }
-145	NONE	NONE	ALL	{ int nosys(void); }   { old setrlimit }
-146	NONE	NONE	ALL	{ int nosys(void); }   { old killpg }
-147	NONE	KERN	ALL	{ int setsid(void); } 
-148	NONE	NONE	ALL	{ int nosys(void); }   { old setquota }
-149	NONE	NONE	ALL	{ int nosys(void); }   { old qquota }
-150	NONE	NONE	ALL	{ int nosys(void); }   { old getsockname }
-151	NONE	KERN	ALL	{ int getpgid(pid_t pid); } 
-152	NONE	KERN	ALL	{ int setprivexec(int flag); } 
-153	PRE 	NONE	ALL	{ user_ssize_t pread(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); } 
-154	PRE 	NONE	ALL	{ user_ssize_t pwrite(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); } 
-
-#if NFSSERVER
-155	NONE	KERN	ALL	{ int nfssvc(int flag, caddr_t argp); } 
+104	AUE_NULL	ALL	{ int nosys(void); }
+105	AUE_NULL	ALL	{ int nosys(void); }
+106	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+107	AUE_NULL	ALL	{ int nosys(void); }   { old vtimes }
+108	AUE_NULL	ALL	{ int nosys(void); }   { old sigvec }
+109	AUE_NULL	ALL	{ int nosys(void); }   { old sigblock }
+110	AUE_NULL	ALL	{ int nosys(void); }   { old sigsetmask }
+111	AUE_NULL	ALL	{ int sigsuspend(sigset_t mask) NO_SYSCALL_STUB; } 
+112	AUE_NULL	ALL	{ int nosys(void); }   { old sigstack }
+#if SOCKETS
+113	AUE_NULL	ALL	{ int nosys(void); }   { old recvmsg }
+114	AUE_NULL	ALL	{ int nosys(void); }   { old sendmsg }	
 #else
-155	NONE	NONE	ALL	{ int nosys(void); } 
-#endif
-
-156	NONE	NONE	ALL	{ int nosys(void); }   { old getdirentries }
-157	NONE	NONE	ALL	{ int statfs(char *path, struct statfs *buf); } 
-158	NONE	NONE	ALL	{ int fstatfs(int fd, struct statfs *buf); } 
-159	NONE	NONE	ALL	{ int unmount(user_addr_t path, int flags); } 
-160	NONE	NONE	ALL	{ int nosys(void); }   { old async_daemon }
-
-#if NFSCLIENT
-161	NONE	KERN	ALL	{ int getfh(char *fname, fhandle_t *fhp); } 
+113	AUE_NULL	ALL	{ int nosys(void); }
+114	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+115	AUE_NULL	ALL	{ int nosys(void); }   { old vtrace }
+116	AUE_GETTIMEOFDAY	ALL	{ int gettimeofday(struct timeval *tp, struct timezone *tzp, uint64_t *mach_absolute_time) NO_SYSCALL_STUB; }
+117	AUE_GETRUSAGE	ALL	{ int getrusage(int who, struct rusage *rusage); } 
+#if SOCKETS
+118	AUE_GETSOCKOPT	ALL	{ int getsockopt(int s, int level, int name, caddr_t val, socklen_t *avalsize); } 
 #else
-161	NONE	NONE	ALL	{ int nosys(void); } 
-#endif
-
-162	NONE	NONE	ALL	{ int nosys(void); }   { old getdomainname }
-163	NONE	NONE	ALL	{ int nosys(void); }   { old setdomainname }
-164	NONE	NONE	ALL	{ int nosys(void); } 
-165	NONE	KERN	ALL	{ int quotactl(char *path, int cmd, int uid, caddr_t arg); } 
-166	NONE	NONE	ALL	{ int nosys(void); }   { old exportfs }
-167	NONE	NONE	ALL	{ int mount(char *type, char *path, int flags, caddr_t data); } 
-168	NONE	NONE	ALL	{ int nosys(void); }   { old ustat }
-169	NONE	NONE	ALL	{ int nosys(void); } 
-170	NONE	NONE	HN	{ int table(void); }   { old table }
-171	NONE	NONE	ALL	{ int nosys(void); }   { old wait3 }
-172	NONE	NONE	ALL	{ int nosys(void); }   { old rpause	}	
-173	PRE	KERN	ALL	{ int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options); } 
-174	NONE	NONE	ALL	{ int nosys(void); }   { old getdents }
-175	NONE	NONE	ALL	{ int nosys(void); }   { old gc_control }
-176	NONE	KERN	ALL	{ int add_profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); } 
-177	NONE	NONE	ALL	{ int nosys(void); } 
-178	NONE	NONE	ALL	{ int nosys(void); } 
-179	NONE	NONE	ALL	{ int nosys(void); } 
-180	NONE	NONE	UALL { int kdebug_trace(int code, int arg1, int arg2, int arg3, int arg4, int arg5); } 
-181	NONE	KERN	ALL	{ int setgid(gid_t gid); } 
-182	NONE	KERN	ALL	{ int setegid(gid_t egid); } 
-183	NONE	KERN	ALL	{ int seteuid(uid_t euid); } 
+118	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+119	AUE_NULL	ALL	{ int nosys(void); }   { old resuba }
+120	AUE_READV	ALL	{ user_ssize_t readv(int fd, struct iovec *iovp, u_int iovcnt); } 
+121	AUE_WRITEV	ALL	{ user_ssize_t writev(int fd, struct iovec *iovp, u_int iovcnt); } 
+122	AUE_SETTIMEOFDAY	ALL	{ int settimeofday(struct timeval *tv, struct timezone *tzp) NO_SYSCALL_STUB; } 
+123	AUE_FCHOWN	ALL	{ int fchown(int fd, int uid, int gid); } 
+124	AUE_FCHMOD	ALL	{ int fchmod(int fd, int mode) NO_SYSCALL_STUB; } 
+125	AUE_NULL	ALL	{ int nosys(void); }   { old recvfrom }
+126	AUE_SETREUID	ALL	{ int setreuid(uid_t ruid, uid_t euid) NO_SYSCALL_STUB; }
+127	AUE_SETREGID	ALL	{ int setregid(gid_t rgid, gid_t egid) NO_SYSCALL_STUB; }
+128	AUE_RENAME	ALL	{ int rename(char *from, char *to) NO_SYSCALL_STUB; } 
+129	AUE_NULL	ALL	{ int nosys(void); }   { old truncate }
+130	AUE_NULL	ALL	{ int nosys(void); }   { old ftruncate }
+131	AUE_FLOCK	ALL	{ int flock(int fd, int how); } 
+132	AUE_MKFIFO	ALL	{ int mkfifo(user_addr_t path, int mode); } 
+#if SOCKETS
+133	AUE_SENDTO	ALL	{ int sendto(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen) NO_SYSCALL_STUB; } 
+134	AUE_SHUTDOWN	ALL	{ int shutdown(int s, int how); } 
+135	AUE_SOCKETPAIR	ALL	{ int socketpair(int domain, int type, int protocol, int *rsv) NO_SYSCALL_STUB; } 
+#else
+133	AUE_NULL	ALL	{ int nosys(void); }
+134	AUE_NULL	ALL	{ int nosys(void); }
+135	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+136	AUE_MKDIR	ALL	{ int mkdir(user_addr_t path, int mode); } 
+137	AUE_RMDIR	ALL	{ int rmdir(char *path) NO_SYSCALL_STUB; } 
+138	AUE_UTIMES	ALL	{ int utimes(char *path, struct timeval *tptr); } 
+139	AUE_FUTIMES	ALL	{ int futimes(int fd, struct timeval *tptr); } 
+140	AUE_ADJTIME	ALL	{ int adjtime(struct timeval *delta, struct timeval *olddelta); } 
+141	AUE_NULL	ALL	{ int nosys(void); }   { old getpeername }
+142	AUE_SYSCTL	ALL	{ int gethostuuid(unsigned char *uuid_buf, const struct timespec *timeoutp) NO_SYSCALL_STUB; }
+143	AUE_NULL	ALL	{ int nosys(void); }   { old sethostid 	}
+144	AUE_NULL	ALL	{ int nosys(void); }   { old getrlimit }
+145	AUE_NULL	ALL	{ int nosys(void); }   { old setrlimit }
+146	AUE_NULL	ALL	{ int nosys(void); }   { old killpg }
+147	AUE_SETSID	ALL	{ int setsid(void); } 
+148	AUE_NULL	ALL	{ int nosys(void); }   { old setquota }
+149	AUE_NULL	ALL	{ int nosys(void); }   { old qquota }
+150	AUE_NULL	ALL	{ int nosys(void); }   { old getsockname }
+151	AUE_GETPGID	ALL	{ int getpgid(pid_t pid); } 
+152	AUE_SETPRIVEXEC	ALL	{ int setprivexec(int flag); } 
+153	AUE_PREAD	ALL	{ user_ssize_t pread(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); } 
+154	AUE_PWRITE	ALL	{ user_ssize_t pwrite(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); } 
 
-#ifdef __ppc__
-184	NONE	KERN	ALL	{ int sigreturn(struct ucontext *uctx, int infostyle); } 
+#if NFSSERVER
+155	AUE_NFS_SVC	ALL	{ int nfssvc(int flag, caddr_t argp); } 
 #else
-184	NONE	NONE	ALL	{ int nosys(void); } 
+155	AUE_NULL	ALL	{ int nosys(void); } 
 #endif
 
-185	NONE	NONE	ALL	{ int nosys(void); } 
-186	NONE	NONE	ALL	{ int nosys(void); } 
-187	NONE	NONE	ALL	{ int nosys(void); } 
-188	NONE	NONE	ALL	{ int stat(user_addr_t path, user_addr_t ub); } 
-189	NONE	NONE	ALL	{ int fstat(int fd, user_addr_t ub); } 
-190	NONE	NONE	ALL	{ int lstat(user_addr_t path, user_addr_t ub); } 
-191	NONE	NONE	ALL	{ int pathconf(char *path, int name); } 
-192	NONE	NONE	ALL	{ int fpathconf(int fd, int name); } 
+156	AUE_NULL	ALL	{ int nosys(void); }   { old getdirentries }
+157	AUE_STATFS	ALL	{ int statfs(char *path, struct statfs *buf); } 
+158	AUE_FSTATFS	ALL	{ int fstatfs(int fd, struct statfs *buf); } 
+159	AUE_UNMOUNT	ALL	{ int unmount(user_addr_t path, int flags); } 
+160	AUE_NULL	ALL	{ int nosys(void); }   { old async_daemon }
 
-#if COMPAT_GETFSSTAT
-193	NONE	NONE	ALL	{ int getfsstat(user_addr_t buf, user_long_t bufsize, int flags); } 
+#if NFSSERVER
+161	AUE_NFS_GETFH	ALL	{ int getfh(char *fname, fhandle_t *fhp); } 
 #else
-193	NONE	NONE	ALL	{ int nosys(void); } 
+161	AUE_NULL	ALL	{ int nosys(void); } 
 #endif
 
-194	NONE	KERN	ALL	{ int getrlimit(u_int which, struct rlimit *rlp); } 
-195	NONE	KERN	ALL	{ int setrlimit(u_int which, struct rlimit *rlp); } 
-196	NONE	NONE	ALL	{ int getdirentries(int fd, char *buf, u_int count, long *basep); } 
-197	NONE	NONE	ALL	{ user_addr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); } 
-198	NONE	NONE	ALL	{ int nosys(void); } 	{ __syscall }
-199	NONE	NONE	ALL	{ off_t lseek(int fd, off_t offset, int whence); } 
-200	NONE	NONE	ALL	{ int truncate(char *path, off_t length); } 
-201	NONE	NONE	ALL	{ int ftruncate(int fd, off_t length); } 
-202	NONE	KERN    ALL { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); } 
-203	NONE	NONE	ALL	{ int mlock(caddr_t addr, size_t len); } 
-204	NONE	NONE	ALL	{ int munlock(caddr_t addr, size_t len); } 
-205	NONE	NONE	ALL	{ int undelete(user_addr_t path); } 
+162	AUE_NULL	ALL	{ int nosys(void); }   { old getdomainname }
+163	AUE_NULL	ALL	{ int nosys(void); }   { old setdomainname }
+164	AUE_NULL	ALL	{ int nosys(void); } 
+165	AUE_QUOTACTL	ALL	{ int quotactl(const char *path, int cmd, int uid, caddr_t arg); } 
+166	AUE_NULL	ALL	{ int nosys(void); }   { old exportfs }
+167	AUE_MOUNT	ALL	{ int mount(char *type, char *path, int flags, caddr_t data); } 
+168	AUE_NULL	ALL	{ int nosys(void); }   { old ustat }
+169	AUE_CSOPS	ALL	{ int csops(pid_t pid, uint32_t ops, user_addr_t useraddr, user_size_t usersize); } 
+170	AUE_CSOPS	ALL	{ int csops_audittoken(pid_t pid, uint32_t ops, user_addr_t useraddr, user_size_t usersize, user_addr_t uaudittoken); } 
+171	AUE_NULL	ALL	{ int nosys(void); }   { old wait3 }
+172	AUE_NULL	ALL	{ int nosys(void); }   { old rpause	}	
+173	AUE_WAITID	ALL	{ int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options); } 
+174	AUE_NULL	ALL	{ int nosys(void); }   { old getdents }
+175	AUE_NULL	ALL	{ int nosys(void); }   { old gc_control }
+176	AUE_NULL	ALL	{ int nosys(void); }   { old add_profil }
+177	AUE_NULL	ALL	{ int kdebug_typefilter(void** addr, size_t* size) NO_SYSCALL_STUB; } 
+178	AUE_NULL	ALL 	{ uint64_t kdebug_trace_string(uint32_t debugid, uint64_t str_id, const char *str) NO_SYSCALL_STUB; }
+179	AUE_NULL	ALL 	{ int kdebug_trace64(uint32_t code, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4) NO_SYSCALL_STUB; } 
+180	AUE_NULL	ALL 	{ int kdebug_trace(uint32_t code, u_long arg1, u_long arg2, u_long arg3, u_long arg4) NO_SYSCALL_STUB; } 
+181	AUE_SETGID	ALL	{ int setgid(gid_t gid); } 
+182	AUE_SETEGID	ALL	{ int setegid(gid_t egid); } 
+183	AUE_SETEUID	ALL	{ int seteuid(uid_t euid); } 
+184	AUE_SIGRETURN	ALL	{ int sigreturn(struct ucontext *uctx, int infostyle, user_addr_t token) NO_SYSCALL_STUB; }
+185	AUE_NULL	ALL 	{ int enosys(void); } { old chud }
+186	AUE_NULL	ALL	{ int thread_selfcounts(int type, user_addr_t buf, user_size_t nbytes); }
+187	AUE_FDATASYNC	ALL	{ int fdatasync(int fd); } 
+188	AUE_STAT	ALL	{ int stat(user_addr_t path, user_addr_t ub); } 
+189	AUE_FSTAT	ALL	{ int fstat(int fd, user_addr_t ub); } 
+190	AUE_LSTAT	ALL	{ int lstat(user_addr_t path, user_addr_t ub); } 
+191	AUE_PATHCONF	ALL	{ int pathconf(char *path, int name); } 
+192	AUE_FPATHCONF	ALL	{ int fpathconf(int fd, int name); } 
+193	AUE_NULL	ALL	{ int nosys(void); }	{ old getfsstat } 
+194	AUE_GETRLIMIT	ALL	{ int getrlimit(u_int which, struct rlimit *rlp) NO_SYSCALL_STUB; } 
+195	AUE_SETRLIMIT	ALL	{ int setrlimit(u_int which, struct rlimit *rlp) NO_SYSCALL_STUB; } 
+196	AUE_GETDIRENTRIES	ALL	{ int getdirentries(int fd, char *buf, u_int count, long *basep); } 
+197	AUE_MMAP	ALL	{ user_addr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos) NO_SYSCALL_STUB; } 
+198	AUE_NULL	ALL	{ int nosys(void); } 	{ old __syscall }
+199	AUE_LSEEK	ALL	{ off_t lseek(int fd, off_t offset, int whence); } 
+200	AUE_TRUNCATE	ALL	{ int truncate(char *path, off_t length); } 
+201	AUE_FTRUNCATE	ALL	{ int ftruncate(int fd, off_t length); } 
+202	AUE_SYSCTL	ALL 	{ int sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen) NO_SYSCALL_STUB; } 
+203	AUE_MLOCK	ALL	{ int mlock(caddr_t addr, size_t len); } 
+204	AUE_MUNLOCK	ALL	{ int munlock(caddr_t addr, size_t len); } 
+205	AUE_UNDELETE	ALL	{ int undelete(user_addr_t path); } 
 
-#ifdef __ppc__
-206	NONE	NONE	ALL	{ int ATsocket(int proto); } 
-207	NONE	NONE	UALL	{ int ATgetmsg(int fd, void *ctlptr, void *datptr, int *flags); } 
-208	NONE	NONE	UALL	{ int ATputmsg(int fd, void *ctlptr, void *datptr, int flags); } 
-209	NONE	NONE	UALL	{ int ATPsndreq(int fd, unsigned char *buf, int len, int nowait); } 
-210	NONE	NONE	UALL	{ int ATPsndrsp(int fd, unsigned char *respbuff, int resplen, int datalen); } 
-211	NONE	NONE	UALL	{ int ATPgetreq(int fd, unsigned char *buf, int buflen); } 
-212	NONE	NONE	UALL	{ int ATPgetrsp(int fd, unsigned char *bdsp); } 
-213	NONE	NONE	ALL	{ int nosys(void); } 	{ Reserved for AppleTalk }
-#else
-206	NONE	NONE	HN	{ int ATsocket(int proto); } 
-207	NONE	NONE	UHN	{ int ATgetmsg(int fd, void *ctlptr, void *datptr, int *flags); } 
-208	NONE	NONE	UHN	{ int ATputmsg(int fd, void *ctlptr, void *datptr, int flags); } 
-209	NONE	NONE	UHN	{ int ATPsndreq(int fd, unsigned char *buf, int len, int nowait); } 
-210	NONE	NONE	UHN	{ int ATPsndrsp(int fd, unsigned char *respbuff, int resplen, int datalen); } 
-211	NONE	NONE	UHN	{ int ATPgetreq(int fd, unsigned char *buf, int buflen); } 
-212	NONE	NONE	UHN	{ int ATPgetrsp(int fd, unsigned char *bdsp); } 
-213	NONE	NONE	ALL	{ int nosys(void); } 	{ Reserved for AppleTalk }
-#endif /* __ppc__ */
+206	AUE_NULL	ALL	{ int nosys(void); } { old ATsocket }
+207	AUE_NULL	ALL	{ int nosys(void); } { old ATgetmsg }
+208	AUE_NULL	ALL	{ int nosys(void); } { old ATputmsg }
+209	AUE_NULL	ALL	{ int nosys(void); } { old ATsndreq }
+210	AUE_NULL	ALL	{ int nosys(void); } { old ATsndrsp }
+211	AUE_NULL	ALL	{ int nosys(void); } { old ATgetreq }
+212	AUE_NULL	ALL	{ int nosys(void); } { old ATgetrsp }
+213	AUE_NULL	ALL	{ int nosys(void); } 	{ Reserved for AppleTalk }
 
-214	NONE	KERN	ALL	{ int kqueue_from_portset_np(int portset); } 
-215	NONE	KERN	ALL	{ int kqueue_portset_np(int fd); } 
+214	AUE_NULL	ALL	{ int nosys(void); }
+215	AUE_NULL	ALL	{ int nosys(void); }
 
 ; System Calls 216 - 230 are reserved for calls to support HFS/HFS Plus
 ; file system semantics. Currently, we only use 215-227.  The rest is 
 ; for future expansion in anticipation of new MacOS APIs for HFS Plus.
-; These calls are not conditionalized becuase while they are specific
+; These calls are not conditionalized because while they are specific
 ; to HFS semantics, they are not specific to the HFS filesystem.
 ; We expect all filesystems to recognize the call and report that it is
 ; not supported or to actually implement it.
-216	NONE	NONE	UHN	{ int mkcomplex(const char *path, mode_t mode, u_long type); } 	{ soon to be obsolete }
-217	NONE	NONE	UHN	{ int statv(const char *path, struct vstat *vsb); } 	{ soon to be obsolete }
-218	NONE	NONE	UHN	{ int lstatv(const char *path, struct vstat *vsb); } 	{ soon to be obsolete }
-219	NONE	NONE	UHN	{ int fstatv(int fd, struct vstat *vsb); } 	{ soon to be obsolete }
-220	NONE	NONE	ALL	{ int getattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); } 
-221	NONE	NONE	ALL	{ int setattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); } 
-222	NONE	NONE	ALL	{ int getdirentriesattr(int fd, struct attrlist *alist, void *buffer, size_t buffersize, u_long *count, u_long *basep, u_long *newstate, u_long options); } 
-223	NONE	NONE	ALL	{ int exchangedata(const char *path1, const char *path2, u_long options); } 
 
-#ifdef __APPLE_API_OBSOLETE
-224	NONE	NONE	UALL	{ int checkuseraccess(const char *path, uid_t userid, gid_t *groups, int ngroups, int accessrequired, u_long options); } 
-#else
-224	NONE	NONE	ALL	{ int nosys(void); } 	{ HFS checkuseraccess check access to a file }
-#endif /* __APPLE_API_OBSOLETE */
-225	NONE	KERN	ALL	{ int searchfs(const char *path, struct fssearchblock *searchblock, u_long *nummatches, u_long scriptcode, u_long options, struct searchstate *state); } 
-226	NONE	NONE    ALL	{ int delete(user_addr_t path); }       { private delete (Carbon semantics) }
-227	NONE	NONE	ALL	{ int copyfile(char *from, char *to, int mode, int flags); } 
-228	NONE	NONE	ALL	{ int nosys(void); } 
-229	NONE	NONE	ALL	{ int nosys(void); } 
-230	PRE 	NONE	ALL	{ int poll(struct pollfd *fds, u_int nfds, int timeout); } 
-231	NONE	NONE	UALL	{ int watchevent(struct eventreq *u_req, int u_eventmask); } 
-232	NONE	NONE	UALL	{ int waitevent(struct eventreq *u_req, struct timeval *tv); } 
-233	NONE	NONE	UALL	{ int modwatch(struct eventreq *u_req, int u_eventmask); } 
-234	NONE	NONE	ALL	{ user_ssize_t getxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
-235	NONE	NONE	ALL	{ user_ssize_t fgetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
-236	NONE	NONE	ALL	{ int setxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
-237	NONE	NONE	ALL	{ int fsetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
-238	NONE	NONE	ALL	{ int removexattr(user_addr_t path, user_addr_t attrname, int options); } 
-239	NONE	NONE	ALL	{ int fremovexattr(int fd, user_addr_t attrname, int options); } 
-240	NONE	NONE	ALL	{ user_ssize_t listxattr(user_addr_t path, user_addr_t namebuf, size_t bufsize, int options); } 
-241	NONE	NONE	ALL	{ user_ssize_t flistxattr(int fd, user_addr_t namebuf, size_t bufsize, int options); } 
-242	NONE	KERN	ALL	{ int fsctl(const char *path, u_long cmd, caddr_t data, u_long options); } 
-243	NONE	KERN	ALL	{ int initgroups(u_int gidsetsize, gid_t *gidset, int gmuid); } 
-244	NONE	NONE	ALL	{ int nosys(void); } 
-245	NONE	NONE	ALL	{ int nosys(void); } 
-246	NONE	NONE	ALL	{ int nosys(void); } 
+; 216-> 219 used to be mkcomplex and {f,l}statv variants. They are gone now.
+216	AUE_NULL	ALL	{ int open_dprotected_np(user_addr_t path, int flags, int class, int dpflags, int mode) NO_SYSCALL_STUB; }
+217	AUE_FSGETPATH_EXTENDED	ALL	{ user_ssize_t fsgetpath_ext(user_addr_t buf, size_t bufsize, user_addr_t fsid, uint64_t objid, uint32_t options); }
+218	AUE_NULL	ALL	{ int nosys(void); }	{ old lstatv }
+219	AUE_NULL	ALL	{ int nosys(void); }	{ old fstatv }
+220	AUE_GETATTRLIST	ALL	{ int getattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options) NO_SYSCALL_STUB; } 
+221	AUE_SETATTRLIST	ALL	{ int setattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options) NO_SYSCALL_STUB; } 
+222	AUE_GETDIRENTRIESATTR	ALL	{ int getdirentriesattr(int fd, struct attrlist *alist, void *buffer, size_t buffersize, u_long *count, u_long *basep, u_long *newstate, u_long options); } 
+223	AUE_EXCHANGEDATA	ALL	{ int exchangedata(const char *path1, const char *path2, u_long options); } 
+224	AUE_NULL		ALL { int nosys(void); } { old checkuseraccess or fsgetpath }
+225	AUE_SEARCHFS	ALL	{ int searchfs(const char *path, struct fssearchblock *searchblock, uint32_t *nummatches, uint32_t scriptcode, uint32_t options, struct searchstate *state); } 
+226	AUE_DELETE	ALL	{ int delete(user_addr_t path) NO_SYSCALL_STUB; }       { private delete (Carbon semantics) }
+227	AUE_COPYFILE	ALL	{ int copyfile(char *from, char *to, int mode, int flags) NO_SYSCALL_STUB; } 
+228	AUE_FGETATTRLIST	ALL	{ int fgetattrlist(int fd, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); } 
+229	AUE_FSETATTRLIST	ALL	{ int fsetattrlist(int fd, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); } 
+230	AUE_POLL	ALL	{ int poll(struct pollfd *fds, u_int nfds, int timeout); } 
+231	AUE_WATCHEVENT	ALL	{ int watchevent(struct eventreq *u_req, int u_eventmask); } 
+232	AUE_WAITEVENT	ALL	{ int waitevent(struct eventreq *u_req, struct timeval *tv); } 
+233	AUE_MODWATCH	ALL	{ int modwatch(struct eventreq *u_req, int u_eventmask); } 
+234	AUE_GETXATTR	ALL	{ user_ssize_t getxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
+235	AUE_FGETXATTR	ALL	{ user_ssize_t fgetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
+236	AUE_SETXATTR	ALL	{ int setxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
+237	AUE_FSETXATTR	ALL	{ int fsetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); } 
+238	AUE_REMOVEXATTR	ALL	{ int removexattr(user_addr_t path, user_addr_t attrname, int options); } 
+239	AUE_FREMOVEXATTR	ALL	{ int fremovexattr(int fd, user_addr_t attrname, int options); } 
+240	AUE_LISTXATTR	ALL	{ user_ssize_t listxattr(user_addr_t path, user_addr_t namebuf, size_t bufsize, int options); } 
+241	AUE_FLISTXATTR	ALL	{ user_ssize_t flistxattr(int fd, user_addr_t namebuf, size_t bufsize, int options); } 
+242	AUE_FSCTL	ALL	{ int fsctl(const char *path, u_long cmd, caddr_t data, u_int options); } 
+243	AUE_INITGROUPS	ALL	{ int initgroups(u_int gidsetsize, gid_t *gidset, int gmuid) NO_SYSCALL_STUB; } 
+244	AUE_POSIX_SPAWN	ALL	{ int posix_spawn(pid_t *pid, const char *path, const struct _posix_spawn_args_desc *adesc, char **argv, char **envp) NO_SYSCALL_STUB; } 
+245	AUE_FFSCTL	ALL	{ int ffsctl(int fd, u_long cmd, caddr_t data, u_int options); } 
+246	AUE_NULL	ALL	{ int nosys(void); } 
 
 #if NFSCLIENT
-247	NONE	KERN	ALL	{ int nfsclnt(int flag, caddr_t argp); } 
-248	NONE	KERN	ALL	{ int fhopen(const struct fhandle *u_fhp, int flags); } 
+247	AUE_NULL	ALL	{ int nfsclnt(int flag, caddr_t argp); } 
+#else
+247	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+#if NFSSERVER
+248	AUE_FHOPEN	ALL	{ int fhopen(const struct fhandle *u_fhp, int flags); } 
+#else
+248	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+
+249	AUE_NULL	ALL	{ int nosys(void); } 
+250	AUE_MINHERIT	ALL	{ int minherit(void *addr, size_t len, int inherit); } 
+#if SYSV_SEM
+251	AUE_SEMSYS	ALL	{ int semsys(u_int which, int a2, int a3, int a4, int a5) NO_SYSCALL_STUB; } 
+#else
+251	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+#if SYSV_MSG
+252	AUE_MSGSYS	ALL	{ int msgsys(u_int which, int a2, int a3, int a4, int a5) NO_SYSCALL_STUB; }
+#else
+252	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+#if SYSV_SHM
+253	AUE_SHMSYS	ALL	{ int shmsys(u_int which, int a2, int a3, int a4) NO_SYSCALL_STUB; } 
+#else
+253	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+#if SYSV_SEM
+254	AUE_SEMCTL	ALL	{ int semctl(int semid, int semnum, int cmd, semun_t arg) NO_SYSCALL_STUB; } 
+255	AUE_SEMGET	ALL	{ int semget(key_t key, int	nsems, int semflg); } 
+256	AUE_SEMOP	ALL	{ int semop(int semid, struct sembuf *sops, int nsops); } 
+257	AUE_NULL	ALL	{ int nosys(void); }	{ old semconfig } 
+#else
+254	AUE_NULL	ALL	{ int nosys(void); } 
+255	AUE_NULL	ALL	{ int nosys(void); } 
+256	AUE_NULL	ALL	{ int nosys(void); } 
+257	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+#if SYSV_MSG
+258	AUE_MSGCTL	ALL	{ int msgctl(int msqid, int cmd, struct	msqid_ds *buf) NO_SYSCALL_STUB; } 
+259	AUE_MSGGET	ALL	{ int msgget(key_t key, int msgflg); } 
+260	AUE_MSGSND	ALL	{ int msgsnd(int msqid, void *msgp, size_t msgsz, int msgflg); } 
+261	AUE_MSGRCV	ALL	{ user_ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); } 
+#else
+258	AUE_NULL	ALL	{ int nosys(void); } 
+259	AUE_NULL	ALL	{ int nosys(void); } 
+260	AUE_NULL	ALL	{ int nosys(void); } 
+261	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+#if SYSV_SHM
+262	AUE_SHMAT	ALL	{ user_addr_t shmat(int shmid, void *shmaddr, int shmflg); } 
+263	AUE_SHMCTL	ALL	{ int shmctl(int shmid, int cmd, struct shmid_ds *buf) NO_SYSCALL_STUB; } 
+264	AUE_SHMDT	ALL	{ int shmdt(void *shmaddr); } 
+265	AUE_SHMGET	ALL	{ int shmget(key_t key, size_t size, int shmflg); } 
+#else
+262	AUE_NULL	ALL	{ int nosys(void); } 
+263	AUE_NULL	ALL	{ int nosys(void); } 
+264	AUE_NULL	ALL	{ int nosys(void); } 
+265	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+266	AUE_SHMOPEN	ALL	{ int shm_open(const char *name, int oflag, int mode) NO_SYSCALL_STUB; } 
+267	AUE_SHMUNLINK	ALL	{ int shm_unlink(const char *name); } 
+268	AUE_SEMOPEN	ALL	{ user_addr_t sem_open(const char *name, int oflag, int mode, int value) NO_SYSCALL_STUB; } 
+269	AUE_SEMCLOSE	ALL	{ int sem_close(sem_t *sem); } 
+270	AUE_SEMUNLINK	ALL	{ int sem_unlink(const char *name); } 
+271	AUE_SEMWAIT	ALL	{ int sem_wait(sem_t *sem); } 
+272	AUE_SEMTRYWAIT	ALL	{ int sem_trywait(sem_t *sem); } 
+273	AUE_SEMPOST	ALL	{ int sem_post(sem_t *sem); } 
+274	AUE_SYSCTL	ALL 	{ int sys_sysctlbyname(const char *name, size_t namelen, void *old, size_t *oldlenp, void *new, size_t newlen) NO_SYSCALL_STUB; }
+275	AUE_NULL	ALL	{ int enosys(void); } { old sem_init }
+276	AUE_NULL	ALL	{ int enosys(void); } { old sem_destroy }
+277	AUE_OPEN_EXTENDED_RWTC	ALL	{ int open_extended(user_addr_t path, int flags, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; } 
+278	AUE_UMASK_EXTENDED	ALL	{ int umask_extended(int newmask, user_addr_t xsecurity) NO_SYSCALL_STUB; } 
+279	AUE_STAT_EXTENDED	ALL	{ int stat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; } 
+280	AUE_LSTAT_EXTENDED	ALL	{ int lstat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; } 
+281	AUE_FSTAT_EXTENDED	ALL	{ int fstat_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; } 
+282	AUE_CHMOD_EXTENDED	ALL	{ int chmod_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; } 
+283	AUE_FCHMOD_EXTENDED	ALL	{ int fchmod_extended(int fd, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; } 
+284	AUE_ACCESS_EXTENDED	ALL	{ int access_extended(user_addr_t entries, size_t size, user_addr_t results, uid_t uid) NO_SYSCALL_STUB; } 
+285	AUE_SETTID	ALL	{ int settid(uid_t uid, gid_t gid) NO_SYSCALL_STUB; } 
+286	AUE_GETTID	ALL	{ int gettid(uid_t *uidp, gid_t *gidp) NO_SYSCALL_STUB; } 
+287	AUE_SETSGROUPS	ALL	{ int setsgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; } 
+288	AUE_GETSGROUPS	ALL	{ int getsgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; } 
+289	AUE_SETWGROUPS	ALL	{ int setwgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; } 
+290	AUE_GETWGROUPS	ALL	{ int getwgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+291	AUE_MKFIFO_EXTENDED	ALL	{ int mkfifo_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; } 
+292	AUE_MKDIR_EXTENDED	ALL	{ int mkdir_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; } 
+#if CONFIG_EXT_RESOLVER
+293	AUE_IDENTITYSVC	ALL	{ int identitysvc(int opcode, user_addr_t message) NO_SYSCALL_STUB; } 
+#else
+293	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+294	AUE_NULL	ALL	{ int shared_region_check_np(uint64_t *start_address) NO_SYSCALL_STUB; }
+295	AUE_NULL	ALL	{ int nosys(void); } { old shared_region_map_np }
+296	AUE_NULL	ALL	{ int vm_pressure_monitor(int wait_for_pressure, int nsecs_monitored, uint32_t *pages_reclaimed); }
+#if PSYNCH
+297	AUE_NULL	ALL	{ uint32_t psynch_rw_longrdlock(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+298	AUE_NULL	ALL	{ uint32_t psynch_rw_yieldwrlock(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+299	AUE_NULL	ALL	{ int psynch_rw_downgrade(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+300	AUE_NULL	ALL	{ uint32_t psynch_rw_upgrade(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+301	AUE_NULL	ALL	{ uint32_t psynch_mutexwait(user_addr_t mutex,  uint32_t mgen, uint32_t  ugen, uint64_t tid, uint32_t flags) NO_SYSCALL_STUB; }
+302	AUE_NULL	ALL	{ uint32_t psynch_mutexdrop(user_addr_t mutex,  uint32_t mgen, uint32_t  ugen, uint64_t tid, uint32_t flags) NO_SYSCALL_STUB; }
+303	AUE_NULL	ALL	{ uint32_t psynch_cvbroad(user_addr_t cv, uint64_t cvlsgen, uint64_t cvudgen, uint32_t flags, user_addr_t mutex,  uint64_t mugen, uint64_t tid) NO_SYSCALL_STUB; }
+304	AUE_NULL	ALL	{ uint32_t psynch_cvsignal(user_addr_t cv, uint64_t cvlsgen, uint32_t cvugen, int thread_port, user_addr_t mutex,  uint64_t mugen, uint64_t tid, uint32_t flags) NO_SYSCALL_STUB; }
+305	AUE_NULL	ALL	{ uint32_t psynch_cvwait(user_addr_t cv, uint64_t cvlsgen, uint32_t cvugen, user_addr_t mutex,  uint64_t mugen, uint32_t flags, int64_t sec, uint32_t nsec) NO_SYSCALL_STUB; }
+306	AUE_NULL	ALL	{ uint32_t psynch_rw_rdlock(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+307	AUE_NULL	ALL	{ uint32_t psynch_rw_wrlock(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+308	AUE_NULL	ALL	{ uint32_t psynch_rw_unlock(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+309	AUE_NULL	ALL	{ uint32_t psynch_rw_unlock2(user_addr_t rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)  NO_SYSCALL_STUB; }
+#else
+297	AUE_NULL	ALL	{ int nosys(void); } { old reset_shared_file }
+298	AUE_NULL	ALL	{ int nosys(void); } { old new_system_shared_regions }
+299	AUE_NULL	ALL	{ int enosys(void); } { old shared_region_map_file_np }
+300	AUE_NULL	ALL	{ int enosys(void); } { old shared_region_make_private_np }
+301	AUE_NULL	ALL	{ int nosys(void); } 
+302	AUE_NULL	ALL	{ int nosys(void); }
+303	AUE_NULL	ALL	{ int nosys(void); }
+304	AUE_NULL	ALL	{ int nosys(void); }
+305	AUE_NULL	ALL	{ int nosys(void); }
+306	AUE_NULL	ALL	{ int nosys(void); }
+307	AUE_NULL	ALL	{ int nosys(void); }
+308	AUE_NULL	ALL	{ int nosys(void); }
+309	AUE_NULL	ALL	{ int nosys(void); }
+#endif
+310	AUE_GETSID	ALL	{ int getsid(pid_t pid); } 
+311	AUE_SETTIDWITHPID	ALL	{ int settid_with_pid(pid_t pid, int assume) NO_SYSCALL_STUB; } 
+#if PSYNCH
+312	AUE_NULL	ALL	{ int psynch_cvclrprepost(user_addr_t cv, uint32_t cvgen, uint32_t cvugen, uint32_t cvsgen, uint32_t prepocnt, uint32_t preposeq, uint32_t flags) NO_SYSCALL_STUB; }
 #else
-247	NONE	NONE	ALL	{ int nosys(void); } 
-248	NONE	NONE	ALL	{ int nosys(void); } 
+312	AUE_NULL	ALL	{ int nosys(void); } { old __pthread_cond_timedwait }
 #endif
+313	AUE_NULL	ALL	{ int aio_fsync(int op, user_addr_t aiocbp); } 
+314 	AUE_NULL	ALL	{ user_ssize_t aio_return(user_addr_t aiocbp); } 
+315	AUE_NULL	ALL	{ int aio_suspend(user_addr_t aiocblist, int nent, user_addr_t timeoutp); } 
+316	AUE_NULL	ALL	{ int aio_cancel(int fd, user_addr_t aiocbp); } 
+317	AUE_NULL	ALL	{ int aio_error(user_addr_t aiocbp); } 
+318	AUE_NULL	ALL	{ int aio_read(user_addr_t aiocbp); } 
+319	AUE_NULL	ALL	{ int aio_write(user_addr_t aiocbp); } 
+320	AUE_LIOLISTIO	ALL	{ int lio_listio(int mode, user_addr_t aiocblist, int nent, user_addr_t sigp); } 
+321	AUE_NULL	ALL	{ int nosys(void); } { old __pthread_cond_wait }
+322	AUE_IOPOLICYSYS	ALL	{ int iopolicysys(int cmd, void *arg) NO_SYSCALL_STUB; } 
+323	AUE_NULL	ALL	{ int process_policy(int scope, int action, int policy, int policy_subtype, user_addr_t attrp, pid_t target_pid, uint64_t target_threadid) NO_SYSCALL_STUB; } 
+324	AUE_MLOCKALL	ALL	{ int mlockall(int how); } 
+325	AUE_MUNLOCKALL	ALL	{ int munlockall(int how); } 
+326	AUE_NULL	ALL	{ int nosys(void); } 
+327	AUE_ISSETUGID	ALL	{ int issetugid(void); } 
+328	AUE_PTHREADKILL	ALL	{ int __pthread_kill(int thread_port, int sig); } 
+329	AUE_PTHREADSIGMASK	ALL	{ int __pthread_sigmask(int how, user_addr_t set, user_addr_t oset); } 
+330	AUE_SIGWAIT	ALL	{ int __sigwait(user_addr_t set, user_addr_t sig); } 
+331	AUE_NULL	ALL	{ int __disable_threadsignal(int value); } 
+332	AUE_NULL	ALL	{ int __pthread_markcancel(int thread_port); } 
+333	AUE_NULL	ALL	{ int __pthread_canceled(int  action); } 
+
+;#if OLD_SEMWAIT_SIGNAL
+;334	AUE_NULL	ALL	{ int nosys(void); }   { old __semwait_signal }
+;#else
+334     AUE_SEMWAITSIGNAL       ALL     { int __semwait_signal(int cond_sem, int mutex_sem, int timeout, int relative, int64_t tv_sec, int32_t tv_nsec); }
+;#endif
 
-249	NONE	NONE	ALL	{ int nosys(void); } 
-250	NONE	NONE	ALL	{ int minherit(void *addr, size_t len, int inherit); } 
-251	NONE	NONE	ALL	{ int semsys(u_int which, int a2, int a3, int a4, int a5); } 
-252	NONE	NONE	ALL	{ int msgsys(u_int which, int a2, int a3, int a4, int a5); }
-253	NONE	NONE	ALL	{ int shmsys(u_int which, int a2, int a3, int a4); } 
-254	NONE	NONE	ALL	{ int semctl(int semid, int semnum, int cmd, semun_t arg); } 
-255	NONE	NONE	ALL	{ int semget(key_t key, int	nsems, int semflg); } 
-256	NONE	NONE	ALL	{ int semop(int semid, struct sembuf *sops, int nsops); } 
-257	NONE	NONE	ALL	{ int nosys(void); } 
-258	NONE	NONE	ALL	{ int msgctl(int msqid, int cmd, struct	msqid_ds *buf); } 
-259	NONE	NONE	ALL	{ int msgget(key_t key, int msgflg); } 
-260	PRE 	NONE	ALL	{ int msgsnd(int msqid, void *msgp, size_t msgsz, int msgflg); } 
-261	PRE 	NONE	ALL	{ user_ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); } 
-262	NONE	NONE	ALL	{ int shmat(int shmid, void *shmaddr, int shmflg); } 
-263	NONE	NONE	ALL	{ int shmctl(int shmid, int cmd, struct shmid_ds *buf); } 
-264	NONE	NONE	ALL	{ int shmdt(void *shmaddr); } 
-265	NONE	NONE	ALL	{ int shmget(key_t key, size_t size, int shmflg); } 
-266	NONE	NONE	ALL	{ int shm_open(const char *name, int oflag, int mode); } 
-267	NONE	NONE	ALL	{ int shm_unlink(const char *name); } 
-268	NONE	NONE	ALL	{ user_addr_t sem_open(const char *name, int oflag, int mode, int value); } 
-269	NONE	NONE	ALL	{ int sem_close(sem_t *sem); } 
-270	NONE	NONE	ALL	{ int sem_unlink(const char *name); } 
-271	PRE 	NONE	ALL	{ int sem_wait(sem_t *sem); } 
-272	NONE	NONE	ALL	{ int sem_trywait(sem_t *sem); } 
-273	NONE	NONE	ALL	{ int sem_post(sem_t *sem); } 
-274	NONE	NONE	ALL	{ int sem_getvalue(sem_t *sem, int *sval); } 
-275	NONE	NONE 	ALL	{ int sem_init(sem_t *sem, int phsared, u_int value); } 
-276	NONE	NONE	ALL	{ int sem_destroy(sem_t *sem); } 
-277	NONE	NONE	ALL	{ int open_extended(user_addr_t path, int flags, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity); } 
-278	NONE	KERN	ALL	{ int umask_extended(int newmask, user_addr_t xsecurity); } 
-279	NONE	NONE	ALL	{ int stat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size); } 
-280	NONE	NONE	ALL	{ int lstat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size); } 
-281	NONE	NONE	ALL	{ int fstat_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size); } 
-282	NONE	NONE	ALL	{ int chmod_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity); } 
-283	NONE	NONE	ALL	{ int fchmod_extended(int fd, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity); } 
-284	NONE	NONE	ALL	{ int access_extended(user_addr_t entries, size_t size, user_addr_t results, uid_t uid); } 
-285	NONE	NONE	ALL	{ int settid(uid_t uid, gid_t gid); } 
-286	NONE	NONE	ALL	{ int gettid(uid_t *uidp, gid_t *gidp); } 
-287	NONE	NONE	ALL	{ int setsgroups(int setlen, user_addr_t guidset); } 
-288	NONE	NONE	ALL	{ int getsgroups(user_addr_t setlen, user_addr_t guidset); } 
-289	NONE	NONE	ALL	{ int setwgroups(int setlen, user_addr_t guidset); } 
-290	NONE	NONE	ALL	{ int getwgroups(user_addr_t setlen, user_addr_t guidset); }
-291	NONE	NONE	ALL	{ int mkfifo_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity); } 
-292	NONE	NONE	ALL	{ int mkdir_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity); } 
-293	NONE	NONE	ALL	{ int identitysvc(int opcode, user_addr_t message); } 
-294	NONE	NONE	ALL	{ int nosys(void); } 
-295	NONE	NONE	ALL	{ int nosys(void); } 
-296	NONE	KERN	UALL	{ int load_shared_file(char *filename, caddr_t mfa, u_long mfs, caddr_t *ba, int map_cnt, sf_mapping_t *mappings, int *flags); } 
-297	NONE	KERN	UALL	{ int reset_shared_file(caddr_t *ba, int map_cnt, sf_mapping_t *mappings); } 
-298	NONE	KERN	ALL	{ int new_system_shared_regions(void); } 
-299	NONE	KERN	UALL	{ int shared_region_map_file_np(int fd, uint32_t mappingCount, user_addr_t mappings, user_addr_t slide_p); } 
-300	NONE	KERN	UALL	{ int shared_region_make_private_np(uint32_t rangeCount, user_addr_t ranges); } 
-301	NONE	NONE	ALL	{ int nosys(void); } 
-302	NONE	NONE	ALL	{ int nosys(void); } 
-303	NONE	NONE	ALL	{ int nosys(void); } 
-304	NONE	NONE	ALL	{ int nosys(void); } 
-305	NONE	NONE	ALL	{ int nosys(void); } 
-306	NONE	NONE	ALL	{ int nosys(void); } 
-307	NONE	NONE	ALL	{ int nosys(void); } 
-308	NONE	NONE	ALL	{ int nosys(void); } 
-309	NONE	NONE	ALL	{ int nosys(void); } 
-310	NONE	KERN	ALL	{ int getsid(pid_t pid); } 
-311	NONE	NONE	ALL	{ int settid_with_pid(pid_t pid, int assume); } 
-312	NONE	NONE	ALL	{ int nosys(void); } 
-313	NONE	NONE	ALL	{ int aio_fsync(int op, user_addr_t aiocbp); } 
-314 NONE	NONE	ALL	{ user_ssize_t aio_return(user_addr_t aiocbp); } 
-315	PRE 	NONE	ALL	{ int aio_suspend(user_addr_t aiocblist, int nent, user_addr_t timeoutp); } 
-316 NONE	NONE	ALL	{ int aio_cancel(int fd, user_addr_t aiocbp); } 
-317	NONE	NONE	ALL	{ int aio_error(user_addr_t aiocbp); } 
-318	NONE	NONE	ALL	{ int aio_read(user_addr_t aiocbp); } 
-319 NONE	NONE	ALL	{ int aio_write(user_addr_t aiocbp); } 
-320 NONE	NONE	ALL	{ int lio_listio(int mode, user_addr_t aiocblist, int nent, user_addr_t sigp); } 
-321	NONE	NONE	ALL	{ int nosys(void); } 
-322	NONE	NONE	ALL	{ int nosys(void); } 
-323	NONE	NONE	ALL	{ int nosys(void); } 
-324	NONE	NONE	ALL	{ int mlockall(int how); } 
-325	NONE	NONE	ALL	{ int munlockall(int how); } 
-326	NONE	NONE	ALL	{ int nosys(void); } 
-327	NONE	KERN	ALL	{ int issetugid(void); } 
-328	NONE	KERN	ALL	{ int __pthread_kill(int thread_port, int sig); } 
-329	NONE	KERN	ALL	{ int pthread_sigmask(int how, user_addr_t set, user_addr_t oset); } 
-330	PRE 	KERN	ALL	{ int sigwait(user_addr_t set, user_addr_t sig); } 
-331	NONE	KERN	ALL	{ int __disable_threadsignal(int value); } 
-332	NONE	NONE	ALL	{ int __pthread_markcancel(int thread_port); } 
-333	NONE	NONE	ALL	{ int __pthread_canceled(int  action); } 
-334	POST	NONE	ALL	{ int __semwait_signal(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec); } 
-335	NONE	KERN	ALL	{ int utrace(const void *addr, size_t len); } 
-336	NONE	NONE	ALL	{ int nosys(void); } 
-337	NONE	NONE	ALL	{ int nosys(void); } 
-338	NONE	NONE	ALL	{ int nosys(void); } 
-339	NONE	NONE	ALL	{ int nosys(void); } 
-340	NONE	NONE	ALL	{ int nosys(void); } 
-341	NONE	NONE	ALL	{ int nosys(void); } 
-342	NONE	NONE	ALL	{ int nosys(void); } 
-343	NONE	NONE	ALL	{ int nosys(void); } 
-344	NONE	NONE	ALL	{ int nosys(void); } 
-345	NONE	NONE	ALL	{ int nosys(void); } 
-346	NONE	NONE	ALL	{ int nosys(void); } 
-347	NONE	NONE	ALL	{ int nosys(void); } 
-348	NONE	NONE	ALL	{ int nosys(void); } 
-349	NONE	NONE	ALL	{ int nosys(void); } 
-350	NONE	KERN	ALL	{ int audit(void *record, int length); } 
-351	NONE	KERN	ALL	{ int auditon(int cmd, void *data, int length); } 
-352	NONE	KERN	ALL	{ int nosys(void); } 
-353	NONE	KERN	ALL	{ int getauid(au_id_t *auid); } 
-354	NONE	KERN	ALL	{ int setauid(au_id_t *auid); } 
-355	NONE	KERN	ALL	{ int getaudit(struct auditinfo *auditinfo); } 
-356	NONE	KERN	ALL	{ int setaudit(struct auditinfo *auditinfo); } 
-357	NONE	KERN	ALL	{ int getaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); } 
-358	NONE	KERN	ALL	{ int setaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); } 
-359	NONE	KERN	ALL	{ int auditctl(char *path); } 
-360	NONE	NONE	ALL	{ int nosys(void); } 
-361	NONE	NONE	ALL	{ int nosys(void); } 
-362	NONE	NONE	ALL	{ int kqueue(void); } 
-363	NONE	NONE	ALL	{ int kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); } 
-364	NONE	NONE	ALL	{ int lchown(user_addr_t path, uid_t owner, gid_t group); }
-365	NONE	NONE	ALL	{ int nosys(void); } 
-366	NONE	NONE	ALL	{ int nosys(void); } 
-367	NONE	NONE	ALL	{ int nosys(void); } 
-368	NONE	NONE	ALL	{ int nosys(void); } 
-369	NONE	NONE	ALL	{ int nosys(void); } 
+335	AUE_NULL	ALL	{ int nosys(void); }   { old utrace }
+336	AUE_PROCINFO	ALL	{ int proc_info(int32_t callnum,int32_t pid,uint32_t flavor, uint64_t arg,user_addr_t buffer,int32_t buffersize) NO_SYSCALL_STUB; } 
+#if SENDFILE
+337	AUE_SENDFILE	ALL	{ int sendfile(int fd, int s, off_t offset, off_t *nbytes, struct sf_hdtr *hdtr, int flags); } 
+#else /* !SENDFILE */
+337	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SENDFILE */
+338	AUE_STAT64	ALL	{ int stat64(user_addr_t path, user_addr_t ub); } 
+339	AUE_FSTAT64	ALL	{ int fstat64(int fd, user_addr_t ub); } 
+340	AUE_LSTAT64	ALL	{ int lstat64(user_addr_t path, user_addr_t ub); } 
+341	AUE_STAT64_EXTENDED	ALL	{ int stat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; } 
+342	AUE_LSTAT64_EXTENDED	ALL	{ int lstat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; } 
+343	AUE_FSTAT64_EXTENDED	ALL	{ int fstat64_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; } 
+344	AUE_GETDIRENTRIES64	ALL	{ user_ssize_t getdirentries64(int fd, void *buf, user_size_t bufsize, off_t *position) NO_SYSCALL_STUB; } 
+345	AUE_STATFS64	ALL	{ int statfs64(char *path, struct statfs64 *buf); } 
+346	AUE_FSTATFS64	ALL	{ int fstatfs64(int fd, struct statfs64 *buf); } 
+347	AUE_GETFSSTAT64	ALL	{ int getfsstat64(user_addr_t buf, int bufsize, int flags); } 
+348	AUE_NULL	ALL	{ int __pthread_chdir(user_addr_t path); } 
+349	AUE_NULL	ALL	{ int __pthread_fchdir(int fd); } 
+350	AUE_AUDIT	ALL	{ int audit(void *record, int length); } 
+351	AUE_AUDITON	ALL	{ int auditon(int cmd, void *data, int length); } 
+352	AUE_NULL	ALL	{ int nosys(void); } 
+353	AUE_GETAUID	ALL	{ int getauid(au_id_t *auid); } 
+354	AUE_SETAUID	ALL	{ int setauid(au_id_t *auid); } 
+355	AUE_NULL	ALL	{ int nosys(void); }	{ old getaudit }
+356	AUE_NULL	ALL	{ int nosys(void); }	{ old setaudit }
+357	AUE_GETAUDIT_ADDR	ALL	{ int getaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); } 
+358	AUE_SETAUDIT_ADDR	ALL	{ int setaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); } 
+359	AUE_AUDITCTL	ALL	{ int auditctl(char *path); } 
+#if CONFIG_WORKQUEUE
+360	AUE_NULL	ALL	{ user_addr_t bsdthread_create(user_addr_t func, user_addr_t func_arg, user_addr_t stack, user_addr_t pthread, uint32_t flags) NO_SYSCALL_STUB; } 
+361	AUE_NULL	ALL	{ int bsdthread_terminate(user_addr_t stackaddr, size_t freesize, uint32_t port, uint32_t sem) NO_SYSCALL_STUB; } 
+#else
+360	AUE_NULL	ALL	{ int nosys(void); } 
+361	AUE_NULL	ALL	{ int nosys(void); } 
+#endif /* CONFIG_WORKQUEUE */
+362	AUE_KQUEUE	ALL	{ int kqueue(void); } 
+363	AUE_NULL	ALL	{ int kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); } 
+364	AUE_LCHOWN	ALL	{ int lchown(user_addr_t path, uid_t owner, gid_t group) NO_SYSCALL_STUB; }
+365	AUE_NULL	ALL	{ int nosys(void); }	{ old stack_snapshot }
+#if CONFIG_WORKQUEUE
+366	AUE_NULL	ALL	{ int bsdthread_register(user_addr_t threadstart, user_addr_t wqthread, uint32_t flags, user_addr_t stack_addr_hint, user_addr_t targetconc_ptr, uint32_t dispatchqueue_offset, uint32_t tsd_offset) NO_SYSCALL_STUB; } 
+367	AUE_WORKQOPEN	ALL	{ int workq_open(void) NO_SYSCALL_STUB; }
+368	AUE_WORKQOPS	ALL	{ int workq_kernreturn(int options, user_addr_t item, int affinity, int prio) NO_SYSCALL_STUB; }
+#else
+366	AUE_NULL	ALL	{ int nosys(void); } 
+367	AUE_NULL	ALL	{ int nosys(void); } 
+368	AUE_NULL	ALL	{ int nosys(void); } 
+#endif /* CONFIG_WORKQUEUE */
+369	AUE_NULL	ALL	{ int kevent64(int fd, const struct kevent64_s *changelist, int nchanges, struct kevent64_s *eventlist, int nevents, unsigned int flags, const struct timespec *timeout); } 
+#if OLD_SEMWAIT_SIGNAL
+370     AUE_SEMWAITSIGNAL       ALL     { int __old_semwait_signal(int cond_sem, int mutex_sem, int timeout, int relative, const struct timespec *ts); }
+371     AUE_SEMWAITSIGNAL       ALL     { int __old_semwait_signal_nocancel(int cond_sem, int mutex_sem, int timeout, int relative, const struct timespec *ts) NO_SYSCALL_STUB; }
+#else
+370     AUE_NULL        ALL     { int nosys(void); }   { old __semwait_signal }
+371     AUE_NULL        ALL     { int nosys(void); }   { old __semwait_signal }
+#endif
+372	AUE_NULL	ALL	{ uint64_t thread_selfid (void) NO_SYSCALL_STUB; } 
+373	AUE_LEDGER	ALL	{ int ledger(int cmd, caddr_t arg1, caddr_t arg2, caddr_t arg3); } 
+374	AUE_NULL	ALL	{ int kevent_qos(int fd, const struct kevent_qos_s *changelist, int nchanges, struct kevent_qos_s *eventlist, int nevents, void *data_out, size_t *data_available, unsigned int flags); } 
+375	AUE_NULL	ALL	{ int kevent_id(uint64_t id, const struct kevent_qos_s *changelist, int nchanges, struct kevent_qos_s *eventlist, int nevents, void *data_out, size_t *data_available, unsigned int flags); } 
+376	AUE_NULL	ALL	{ int nosys(void); } 
+377	AUE_NULL	ALL	{ int nosys(void); } 
+378	AUE_NULL	ALL	{ int nosys(void); } 
+379	AUE_NULL	ALL	{ int nosys(void); } 
+380	AUE_MAC_EXECVE	ALL	{ int __mac_execve(char *fname, char **argp, char **envp, struct mac *mac_p); } 
+#if CONFIG_MACF
+381	AUE_MAC_SYSCALL	ALL	{ int __mac_syscall(char *policy, int call, user_addr_t arg); } 
+382	AUE_MAC_GET_FILE	ALL	{ int __mac_get_file(char *path_p, struct mac *mac_p); } 
+383	AUE_MAC_SET_FILE	ALL	{ int __mac_set_file(char *path_p, struct mac *mac_p); } 
+384	AUE_MAC_GET_LINK	ALL	{ int __mac_get_link(char *path_p, struct mac *mac_p); } 
+385	AUE_MAC_SET_LINK	ALL	{ int __mac_set_link(char *path_p, struct mac *mac_p); } 
+386	AUE_MAC_GET_PROC	ALL	{ int __mac_get_proc(struct mac *mac_p); } 
+387	AUE_MAC_SET_PROC	ALL	{ int __mac_set_proc(struct mac *mac_p); } 
+388	AUE_MAC_GET_FD	ALL	{ int __mac_get_fd(int fd, struct mac *mac_p); } 
+389	AUE_MAC_SET_FD	ALL	{ int __mac_set_fd(int fd, struct mac *mac_p); } 
+390	AUE_MAC_GET_PID	ALL	{ int __mac_get_pid(pid_t pid, struct mac *mac_p); } 
+#else
+381     AUE_MAC_SYSCALL ALL     { int enosys(void); }
+382     AUE_MAC_GET_FILE        ALL     { int nosys(void); }
+383     AUE_MAC_SET_FILE        ALL     { int nosys(void); }
+384     AUE_MAC_GET_LINK        ALL     { int nosys(void); }
+385     AUE_MAC_SET_LINK        ALL     { int nosys(void); }
+386     AUE_MAC_GET_PROC        ALL     { int nosys(void); }
+387     AUE_MAC_SET_PROC        ALL     { int nosys(void); }
+388     AUE_MAC_GET_FD  ALL     { int nosys(void); }
+389     AUE_MAC_SET_FD  ALL     { int nosys(void); }
+390     AUE_MAC_GET_PID ALL     { int nosys(void); }
+#endif
+391	AUE_NULL	ALL	{ int enosys(void); }
+392	AUE_NULL	ALL	{ int enosys(void); }
+393	AUE_NULL	ALL	{ int enosys(void); }
+394	AUE_SELECT	ALL	{ int pselect(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, const struct timespec *ts, const struct sigset_t *mask) NO_SYSCALL_STUB; }
+395	AUE_SELECT	ALL	{ int pselect_nocancel(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, const struct timespec *ts, const struct sigset_t *mask) NO_SYSCALL_STUB; }
+396	AUE_NULL	ALL	{ user_ssize_t read_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; } 
+397	AUE_NULL	ALL	{ user_ssize_t write_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; } 
+398	AUE_OPEN_RWTC	ALL	{ int open_nocancel(user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; } 
+399	AUE_CLOSE	ALL	{ int close_nocancel(int fd) NO_SYSCALL_STUB; } 
+400	AUE_WAIT4	ALL	{ int wait4_nocancel(int pid, user_addr_t status, int options, user_addr_t rusage) NO_SYSCALL_STUB; } 
+#if SOCKETS
+401	AUE_RECVMSG	ALL	{ int recvmsg_nocancel(int s, struct msghdr *msg, int flags) NO_SYSCALL_STUB; } 
+402	AUE_SENDMSG	ALL	{ int sendmsg_nocancel(int s, caddr_t msg, int flags) NO_SYSCALL_STUB; } 
+403	AUE_RECVFROM	ALL	{ int recvfrom_nocancel(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr) NO_SYSCALL_STUB; } 
+404	AUE_ACCEPT	ALL	{ int accept_nocancel(int s, caddr_t name, socklen_t	*anamelen) NO_SYSCALL_STUB; } 
+#else
+401	AUE_NULL	ALL	{ int nosys(void); }
+402	AUE_NULL	ALL	{ int nosys(void); }
+403	AUE_NULL	ALL	{ int nosys(void); }
+404	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+405	AUE_MSYNC	ALL	{ int msync_nocancel(caddr_t addr, size_t len, int flags) NO_SYSCALL_STUB; } 
+406	AUE_FCNTL	ALL	{ int fcntl_nocancel(int fd, int cmd, long arg) NO_SYSCALL_STUB; } 
+407	AUE_SELECT	ALL	{ int select_nocancel(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv) NO_SYSCALL_STUB; } 
+408	AUE_FSYNC	ALL	{ int fsync_nocancel(int fd) NO_SYSCALL_STUB; } 
+#if SOCKETS
+409	AUE_CONNECT	ALL	{ int connect_nocancel(int s, caddr_t name, socklen_t namelen) NO_SYSCALL_STUB; } 
+#else
+409	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+410	AUE_NULL	ALL	{ int sigsuspend_nocancel(sigset_t mask) NO_SYSCALL_STUB; } 
+411	AUE_READV	ALL	{ user_ssize_t readv_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; } 
+412	AUE_WRITEV	ALL	{ user_ssize_t writev_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; } 
+#if SOCKETS
+413	AUE_SENDTO	ALL	{ int sendto_nocancel(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen) NO_SYSCALL_STUB; } 
+#else
+413	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+414	AUE_PREAD	ALL	{ user_ssize_t pread_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; } 
+415	AUE_PWRITE	ALL	{ user_ssize_t pwrite_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; } 
+416	AUE_WAITID	ALL	{ int waitid_nocancel(idtype_t idtype, id_t id, siginfo_t *infop, int options) NO_SYSCALL_STUB; } 
+417	AUE_POLL	ALL	{ int poll_nocancel(struct pollfd *fds, u_int nfds, int timeout) NO_SYSCALL_STUB; } 
+#if SYSV_MSG
+418	AUE_MSGSND	ALL	{ int msgsnd_nocancel(int msqid, void *msgp, size_t msgsz, int msgflg) NO_SYSCALL_STUB; } 
+419	AUE_MSGRCV	ALL	{ user_ssize_t msgrcv_nocancel(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg) NO_SYSCALL_STUB; } 
+#else
+418	AUE_NULL	ALL	{ int nosys(void); } 
+419	AUE_NULL	ALL	{ int nosys(void); } 
+#endif
+420	AUE_SEMWAIT	ALL	{ int sem_wait_nocancel(sem_t *sem) NO_SYSCALL_STUB; } 
+421	AUE_NULL	ALL	{ int aio_suspend_nocancel(user_addr_t aiocblist, int nent, user_addr_t timeoutp) NO_SYSCALL_STUB; } 
+422	AUE_SIGWAIT	ALL	{ int __sigwait_nocancel(user_addr_t set, user_addr_t sig) NO_SYSCALL_STUB; } 
+;#if OLD_SEMWAIT_SIGNAL 
+;423	AUE_NULL	ALL	{ int nosys(void); }   { old __semwait_signal_nocancel }
+;#else
+423     AUE_SEMWAITSIGNAL       ALL     { int __semwait_signal_nocancel(int cond_sem, int mutex_sem, int timeout, int relative, int64_t tv_sec, int32_t tv_nsec); }
+;#endif
+424	AUE_MAC_MOUNT	ALL	{ int __mac_mount(char *type, char *path, int flags, caddr_t data, struct mac *mac_p); } 
+#if CONFIG_MACF
+425	AUE_MAC_GET_MOUNT	ALL	{ int __mac_get_mount(char *path, struct mac *mac_p); } 
+#else
+425     AUE_MAC_GET_MOUNT       ALL     { int nosys(void); }
+#endif
+426	AUE_MAC_GETFSSTAT	ALL	{ int __mac_getfsstat(user_addr_t buf, int bufsize, user_addr_t mac, int macsize, int flags); } 
+427	AUE_FSGETPATH	ALL	{ user_ssize_t fsgetpath(user_addr_t buf, size_t bufsize, user_addr_t fsid, uint64_t objid); } { private fsgetpath (File Manager SPI) }
+428	AUE_NULL	ALL	{ mach_port_name_t audit_session_self(void); }
+429	AUE_NULL	ALL	{ int audit_session_join(mach_port_name_t port); }
+430	AUE_NULL	ALL	{ int fileport_makeport(int fd, user_addr_t portnamep); }
+431	AUE_NULL	ALL	{ int fileport_makefd(mach_port_name_t port); }
+432	AUE_NULL	ALL	{ int audit_session_port(au_asid_t asid, user_addr_t portnamep); }
+433	AUE_NULL	ALL	{ int pid_suspend(int pid); }
+434	AUE_NULL	ALL	{ int pid_resume(int pid); }
+#if CONFIG_EMBEDDED
+435	AUE_NULL	ALL	{ int pid_hibernate(int pid); }
+#else
+435     AUE_NULL        ALL     { int nosys(void); }
+#endif
+#if SOCKETS
+436	AUE_NULL	ALL	{ int pid_shutdown_sockets(int pid, int level); }
+#else
+436	AUE_NULL	ALL	{ int nosys(void); }
+#endif
+437	AUE_NULL	ALL	{ int nosys(void); } { old shared_region_slide_np }
+438	AUE_NULL	ALL	{ int shared_region_map_and_slide_np(int fd, uint32_t count, const struct shared_file_mapping_np *mappings, uint32_t slide, uint64_t* slide_start, uint32_t slide_size) NO_SYSCALL_STUB; }
+439	AUE_NULL	ALL	{ int kas_info(int selector, void *value, size_t *size); }
+#if CONFIG_MEMORYSTATUS
+440	AUE_NULL	ALL	{ int memorystatus_control(uint32_t command, int32_t pid, uint32_t flags, user_addr_t buffer, size_t buffersize); } 
+#else
+440	AUE_NULL	ALL	{ int nosys(void); }
+#endif
+441	AUE_OPEN_RWTC	ALL	{ int guarded_open_np(user_addr_t path, const guardid_t *guard, u_int guardflags, int flags, int mode) NO_SYSCALL_STUB; }
+442	AUE_CLOSE	ALL	{ int guarded_close_np(int fd, const guardid_t *guard); }
+443	AUE_KQUEUE	ALL	{ int guarded_kqueue_np(const guardid_t *guard, u_int guardflags); }
+444	AUE_NULL	ALL	{ int change_fdguard_np(int fd, const guardid_t *guard, u_int guardflags, const guardid_t *nguard, u_int nguardflags, int *fdflagsp); }
+445	AUE_USRCTL	ALL	{ int usrctl(uint32_t flags); }
+446	AUE_NULL	ALL	{ int proc_rlimit_control(pid_t pid, int flavor, void *arg); }
+#if SOCKETS
+447	AUE_CONNECT	ALL	{ int connectx(int socket, const sa_endpoints_t *endpoints, sae_associd_t associd, unsigned int flags, const struct iovec *iov, unsigned int iovcnt, size_t *len, sae_connid_t *connid); }
+448	AUE_NULL	ALL	{ int disconnectx(int s, sae_associd_t aid, sae_connid_t cid); }
+449	AUE_NULL	ALL	{ int peeloff(int s, sae_associd_t aid); }
+450	AUE_SOCKET	ALL	{ int socket_delegate(int domain, int type, int protocol, pid_t epid); } 
+#else
+447	AUE_NULL	ALL	{ int nosys(void); }
+448	AUE_NULL	ALL	{ int nosys(void); }
+449	AUE_NULL	ALL	{ int nosys(void); }
+450	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+451	AUE_NULL	ALL	{ int telemetry(uint64_t cmd, uint64_t deadline, uint64_t interval, uint64_t leeway, uint64_t arg4, uint64_t arg5) NO_SYSCALL_STUB; } 
+#if CONFIG_PROC_UUID_POLICY
+452	AUE_NULL	ALL	{ int proc_uuid_policy(uint32_t operation, uuid_t uuid, size_t uuidlen, uint32_t flags); }
+#else
+452	AUE_NULL	ALL	{ int nosys(void); }
+#endif
+#if CONFIG_MEMORYSTATUS
+453	AUE_NULL	ALL	{ int memorystatus_get_level(user_addr_t level); }
+#else
+453	AUE_NULL	ALL	{ int nosys(void); }
+#endif
+454	AUE_NULL	ALL	{ int system_override(uint64_t timeout, uint64_t flags); }
+455	AUE_NULL	ALL	{ int vfs_purge(void); }
+456	AUE_NULL	ALL	{ int sfi_ctl(uint32_t operation, uint32_t sfi_class, uint64_t time, uint64_t *out_time) NO_SYSCALL_STUB; }
+457	AUE_NULL	ALL	{ int sfi_pidctl(uint32_t operation, pid_t pid, uint32_t sfi_flags, uint32_t *out_sfi_flags) NO_SYSCALL_STUB; }
+#if CONFIG_COALITIONS
+458	AUE_NULL	ALL	{ int coalition(uint32_t operation, uint64_t *cid, uint32_t flags) NO_SYSCALL_STUB; }
+459	AUE_NULL	ALL	{ int coalition_info(uint32_t flavor, uint64_t *cid, void *buffer, size_t *bufsize) NO_SYSCALL_STUB; }
+#else
+458	AUE_NULL	ALL	{ int enosys(void); }
+459	AUE_NULL	ALL	{ int enosys(void); }
+#endif /* COALITIONS */
+#if NECP
+460 AUE_NECP	ALL { int necp_match_policy(uint8_t *parameters, size_t parameters_size, struct necp_aggregate_result *returned_result); }
+#else
+460	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* NECP */
+461	AUE_GETATTRLISTBULK	ALL	{ int getattrlistbulk(int dirfd, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, uint64_t options); }
+462	AUE_CLONEFILEAT	ALL     { int clonefileat(int src_dirfd, user_addr_t src, int dst_dirfd, user_addr_t dst, uint32_t flags); }
+463	AUE_OPENAT_RWTC	ALL	{ int openat(int fd, user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; }
+464	AUE_OPENAT_RWTC	ALL	{ int openat_nocancel(int fd, user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; }
+465	AUE_RENAMEAT	ALL	{ int renameat(int fromfd, char *from, int tofd, char *to) NO_SYSCALL_STUB; }
+466	AUE_FACCESSAT	ALL	{ int faccessat(int fd, user_addr_t path, int amode, int flag); }
+467	AUE_FCHMODAT	ALL	{ int fchmodat(int fd, user_addr_t path, int mode, int flag); }
+468	AUE_FCHOWNAT	ALL	{ int fchownat(int fd, user_addr_t path, uid_t uid,gid_t gid, int flag); }
+469	AUE_FSTATAT	ALL	{ int fstatat(int fd, user_addr_t path, user_addr_t ub, int flag); }
+470	AUE_FSTATAT	ALL	{ int fstatat64(int fd, user_addr_t path, user_addr_t ub, int flag); }
+471	AUE_LINKAT	ALL	{ int linkat(int fd1, user_addr_t path, int fd2, user_addr_t link, int flag); }
+472	AUE_UNLINKAT	ALL	{ int unlinkat(int fd, user_addr_t path, int flag) NO_SYSCALL_STUB; }
+473	AUE_READLINKAT	ALL	{ int readlinkat(int fd, user_addr_t path, user_addr_t buf, size_t bufsize); }
+474	AUE_SYMLINKAT	ALL	{ int symlinkat(user_addr_t *path1, int fd, user_addr_t path2); }
+475	AUE_MKDIRAT	ALL	{ int mkdirat(int fd, user_addr_t path, int mode); }
+476	AUE_GETATTRLISTAT	ALL	{ int getattrlistat(int fd, const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); } 
+477	AUE_NULL	ALL	{ int proc_trace_log(pid_t pid, uint64_t uniqueid); } 
+478	AUE_NULL	ALL	{ int bsdthread_ctl(user_addr_t cmd, user_addr_t arg1, user_addr_t arg2, user_addr_t arg3) NO_SYSCALL_STUB; }
+479	AUE_OPENBYID_RWT	ALL	{ int openbyid_np(user_addr_t fsid, user_addr_t objid, int oflags); }
+#if SOCKETS
+480	AUE_NULL	ALL	{ user_ssize_t recvmsg_x(int s, struct msghdr_x *msgp, u_int cnt, int flags); }
+481	AUE_NULL	ALL	{ user_ssize_t sendmsg_x(int s, struct msghdr_x *msgp, u_int cnt, int flags); }
+#else
+480	AUE_NULL	ALL	{ int nosys(void); }
+481	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* SOCKETS */
+482	AUE_NULL	ALL	{ uint64_t thread_selfusage(void) NO_SYSCALL_STUB; }
+#if CONFIG_CSR
+483	AUE_NULL	ALL	{ int csrctl(uint32_t op, user_addr_t useraddr, user_addr_t usersize) NO_SYSCALL_STUB; }
+#else
+483	AUE_NULL	ALL	{ int enosys(void); }
+#endif /* CSR */
+484	AUE_NULL	ALL	{ int guarded_open_dprotected_np(user_addr_t path, const guardid_t *guard, u_int guardflags, int flags, int dpclass, int dpflags, int mode) NO_SYSCALL_STUB; }
+485	AUE_NULL	ALL	{ user_ssize_t guarded_write_np(int fd, const guardid_t *guard, user_addr_t cbuf, user_size_t nbyte); }
+486	AUE_PWRITE	ALL	{ user_ssize_t guarded_pwrite_np(int fd, const guardid_t *guard, user_addr_t buf, user_size_t nbyte, off_t offset); }
+487	AUE_WRITEV	ALL	{ user_ssize_t guarded_writev_np(int fd, const guardid_t *guard, struct iovec *iovp, int iovcnt); }
+488	AUE_RENAMEAT	ALL	{ int renameatx_np(int fromfd, char *from, int tofd, char *to, u_int flags) NO_SYSCALL_STUB; }
+#if CONFIG_CODE_DECRYPTION
+489	AUE_MPROTECT	ALL	{ int mremap_encrypted(caddr_t addr, size_t len, uint32_t cryptid, uint32_t cputype, uint32_t cpusubtype); } 
+#else
+489	AUE_NULL	ALL	{ int enosys(void); }
+#endif
+#if NETWORKING
+490	AUE_NETAGENT	ALL	{ int netagent_trigger(uuid_t agent_uuid, size_t agent_uuidlen); }
+#else
+490	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* NETWORKING */
+491	AUE_STACKSNAPSHOT ALL	{ int stack_snapshot_with_config(int stackshot_config_version, user_addr_t stackshot_config, size_t stackshot_config_size) NO_SYSCALL_STUB; }
+#if CONFIG_TELEMETRY
+492	AUE_STACKSNAPSHOT ALL	{ int microstackshot(user_addr_t tracebuf, uint32_t tracebuf_size, uint32_t flags) NO_SYSCALL_STUB; }
+#else
+492	AUE_NULL	ALL { int enosys(void); }
+#endif /* CONFIG_TELEMETRY */
+#if PGO
+493 	AUE_NULL	ALL	{ user_ssize_t grab_pgo_data (user_addr_t uuid, int flags, user_addr_t buffer, user_ssize_t size); }
+#else
+493	AUE_NULL	ALL { int enosys(void); }
+#endif
+#if CONFIG_PERSONAS
+494	AUE_PERSONA	ALL	{ int persona(uint32_t operation, uint32_t flags, struct kpersona_info *info, uid_t *id, size_t *idlen, char *path) NO_SYSCALL_STUB; }
+#else
+494	AUE_NULL	ALL	{ int enosys(void); }
+#endif
+495	AUE_NULL	ALL	{ int enosys(void); }
+496	AUE_NULL	ALL	{ int enosys(void); }
+497 AUE_NULL	ALL	{ int enosys(void); }
+498	AUE_NULL	ALL	{ int enosys(void); }
+499	AUE_NULL	ALL	{ int work_interval_ctl(uint32_t operation, uint64_t work_interval_id, void *arg, size_t len) NO_SYSCALL_STUB; }
+500	AUE_NULL	ALL	{ int getentropy(void *buffer, size_t size); }
+#if NECP
+501	AUE_NECP	ALL	{ int necp_open(int flags); } }
+502	AUE_NECP	ALL	{ int necp_client_action(int necp_fd, uint32_t action, uuid_t client_id, size_t client_id_len, uint8_t *buffer, size_t buffer_size); }
+#else
+501	AUE_NULL	ALL	{ int enosys(void); }
+502	AUE_NULL	ALL	{ int enosys(void); }
+#endif /* NECP */
+503	AUE_NULL	ALL	{ int enosys(void); }
+504	AUE_NULL	ALL	{ int enosys(void); }
+505	AUE_NULL	ALL	{ int enosys(void); }
+506	AUE_NULL	ALL	{ int enosys(void); }
+507	AUE_NULL	ALL	{ int enosys(void); }
+508	AUE_NULL	ALL	{ int enosys(void); }
+509	AUE_NULL	ALL	{ int enosys(void); }
+510	AUE_NULL	ALL	{ int enosys(void); }
+511	AUE_NULL	ALL	{ int enosys(void); }
+512	AUE_NULL	ALL	{ int enosys(void); }
+513	AUE_NULL	ALL	{ int enosys(void); }
+514	AUE_NULL	ALL	{ int enosys(void); }
+515	AUE_NULL	ALL	{ int ulock_wait(uint32_t operation, void *addr, uint64_t value, uint32_t timeout) NO_SYSCALL_STUB; }
+516	AUE_NULL	ALL	{ int ulock_wake(uint32_t operation, void *addr, uint64_t wake_value) NO_SYSCALL_STUB; }
+517	AUE_FCLONEFILEAT	ALL     { int fclonefileat(int src_fd, int dst_dirfd, user_addr_t dst, uint32_t flags); }
+518	AUE_NULL	ALL     { int fs_snapshot(uint32_t op, int dirfd, user_addr_t name1, user_addr_t name2, user_addr_t data, uint32_t flags) NO_SYSCALL_STUB; }
+519	AUE_NULL	ALL	{ int enosys(void); }
+520	AUE_KILL	ALL	{ int terminate_with_payload(int pid, uint32_t reason_namespace, uint64_t reason_code, void *payload, uint32_t payload_size, const char *reason_string, uint64_t reason_flags) NO_SYSCALL_STUB; }
+521	AUE_EXIT	ALL	{ void abort_with_payload(uint32_t reason_namespace, uint64_t reason_code, void *payload, uint32_t payload_size, const char *reason_string, uint64_t reason_flags) NO_SYSCALL_STUB; }
+#if NECP
+522	AUE_NECP	ALL	{ int necp_session_open(int flags); } }
+523	AUE_NECP	ALL	{ int necp_session_action(int necp_fd, uint32_t action, uint8_t *in_buffer, size_t in_buffer_length, uint8_t *out_buffer, size_t out_buffer_length); }
+#else /* NECP */
+522	AUE_NULL	ALL	{ int enosys(void); }
+523	AUE_NULL	ALL	{ int enosys(void); }
+#endif /* NECP */
+524	AUE_SETATTRLISTAT	ALL	{ int setattrlistat(int fd, const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, uint32_t options); }
+525	AUE_NET		ALL	{ int net_qos_guideline(struct net_qos_param *param, uint32_t param_len); }
+526	AUE_FMOUNT	ALL	{ int fmount(const char *type, int fd, int flags, void *data); }
+527	AUE_NULL	ALL	{ int ntp_adjtime(struct timex *tp); }
+528	AUE_NULL	ALL	{ int ntp_gettime(struct ntptimeval *ntvp); }
+529	AUE_NULL	ALL	{ int os_fault_with_payload(uint32_t reason_namespace, uint64_t reason_code, void *payload, uint32_t payload_size, const char *reason_string, uint64_t reason_flags); }
+#if CONFIG_WORKQUEUE
+530	AUE_WORKLOOPCTL	ALL	{ int kqueue_workloop_ctl(user_addr_t cmd, uint64_t options, user_addr_t addr, size_t sz) NO_SYSCALL_STUB; }
+#else
+530	AUE_NULL	ALL	{ int enosys(void); }
+#endif // CONFIG_WORKQUEUE
+531	AUE_NULL	ALL	{ uint64_t __mach_bridge_remote_time(uint64_t local_timestamp); }
+#if CONFIG_COALITIONS
+532 AUE_NULL  ALL { int coalition_ledger(uint32_t operation, uint64_t *cid, void *buffer, size_t *bufsize) NO_SYSCALL_STUB; }
+#else
+532   AUE_NULL    ALL { int enosys(void); }
+#endif // CONFIG_COALITIONS
+533     AUE_NULL        ALL     { int log_data(unsigned int tag, unsigned int flags, void *buffer, unsigned int size) NO_SYSCALL_STUB; }
+534 AUE_NULL	ALL	{ uint64_t memorystatus_available_memory(void) NO_SYSCALL_STUB; }