Replace the CloudABI system call table by a machine generated version.

The type definitions and constants that were used by COMPAT_CLOUDABI64
are a literal copy of some headers stored inside of CloudABI's C
library, cloudlibc. What is annoying is that we can't make use of
cloudlibc's system call list, as the format is completely different and
doesn't provide enough information. It had to be synced in manually.

We recently decided to solve this (and some other problems) by moving
the ABI definitions into a separate file:

	https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt

This file is processed by a pile of Python scripts to generate the
header files like before, documentation (markdown), but in our case more
importantly: a FreeBSD system call table.

This change discards the old files in sys/contrib/cloudabi and replaces
them by the latest copies, which requires some minor changes here and
there. Because cloudabi.txt also enforces consistent names of the system
call arguments, we have to patch up a small number of system call
implementations to use the new argument names.

The new header files can also be included directly in FreeBSD kernel
space without needing any includes/defines, so we can now remove
cloudabi_syscalldefs.h and cloudabi64_syscalldefs.h. Patch up the
sources to include the definitions directly from sys/contrib/cloudabi
instead.

22 files changed, 94 insertions, 388 deletions

diff --git a/sys/compat/cloudabi/cloudabi_clock.c b/sys/compat/cloudabi/cloudabi_clock.c
index ed32cf611f72..b26d98eec699 100644
--- a/sys/compat/cloudabi/cloudabi_clock.c
+++ b/sys/compat/cloudabi/cloudabi_clock.c
@@ -31,8 +31,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/stdint.h>
 #include <sys/syscallsubr.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 #include <compat/cloudabi/cloudabi_util.h>
 
 /* Converts a CloudABI clock ID to a FreeBSD clock ID. */
diff --git a/sys/compat/cloudabi/cloudabi_errno.c b/sys/compat/cloudabi/cloudabi_errno.c
index 5193cfc196e3..38520b9c262c 100644
--- a/sys/compat/cloudabi/cloudabi_errno.c
+++ b/sys/compat/cloudabi/cloudabi_errno.c
@@ -28,7 +28,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_util.h>
 
 /* Converts a FreeBSD errno to a CloudABI errno. */
diff --git a/sys/compat/cloudabi/cloudabi_fd.c b/sys/compat/cloudabi/cloudabi_fd.c
index 17177d21929c..c044adcdf1d8 100644
--- a/sys/compat/cloudabi/cloudabi_fd.c
+++ b/sys/compat/cloudabi/cloudabi_fd.c
@@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 #include <compat/cloudabi/cloudabi_util.h>
 
 /* Translation between CloudABI and Capsicum rights. */
diff --git a/sys/compat/cloudabi/cloudabi_file.c b/sys/compat/cloudabi/cloudabi_file.c
index cdf058572dbb..f48b7541da7c 100644
--- a/sys/compat/cloudabi/cloudabi_file.c
+++ b/sys/compat/cloudabi/cloudabi_file.c
@@ -39,8 +39,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/vnode.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 #include <compat/cloudabi/cloudabi_util.h>
 
 #include <security/mac/mac_framework.h>
@@ -185,8 +186,8 @@ cloudabi_sys_file_link(struct thread *td,
 		return (error);
 	}
 
-	error = kern_linkat(td, uap->fd1, uap->fd2, path1, path2,
-	    UIO_SYSSPACE, (uap->fd1 & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) != 0 ?
+	error = kern_linkat(td, uap->fd1.fd, uap->fd2, path1, path2,
+	    UIO_SYSSPACE, (uap->fd1.flags & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) ?
 	    FOLLOW : NOFOLLOW);
 	cloudabi_freestr(path1);
 	cloudabi_freestr(path2);
@@ -248,7 +249,7 @@ cloudabi_sys_file_open(struct thread *td,
 		fflags |= O_SYNC;
 		cap_rights_set(&rights, CAP_FSYNC);
 	}
-	if ((uap->fd & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) == 0)
+	if ((uap->dirfd.flags & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) == 0)
 		fflags |= O_NOFOLLOW;
 	if (write && (fflags & (O_APPEND | O_TRUNC)) == 0)
 		cap_rights_set(&rights, CAP_SEEK);
@@ -265,7 +266,7 @@ cloudabi_sys_file_open(struct thread *td,
 		fdrop(fp, td);
 		return (error);
 	}
-	NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, uap->fd,
+	NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, uap->dirfd.fd,
 	    &rights, td);
 	error = vn_open(&nd, &fflags, 0777 & ~td->td_proc->p_fd->fd_cmask, fp);
 	cloudabi_freestr(path);
@@ -657,8 +658,8 @@ cloudabi_sys_file_stat_get(struct thread *td,
 		return (error);
 
 	error = kern_statat(td,
-	    (uap->fd & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) != 0 ? 0 :
-	    AT_SYMLINK_NOFOLLOW, uap->fd, path, UIO_SYSSPACE, &sb, NULL);
+	    (uap->fd.flags & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) != 0 ? 0 :
+	    AT_SYMLINK_NOFOLLOW, uap->fd.fd, path, UIO_SYSSPACE, &sb, NULL);
 	cloudabi_freestr(path);
 	if (error != 0)
 		return (error);
@@ -711,8 +712,8 @@ cloudabi_sys_file_stat_put(struct thread *td,
 		return (error);
 
 	convert_utimens_arguments(&fs, uap->flags, ts);
-	error = kern_utimensat(td, uap->fd, path, UIO_SYSSPACE, ts,
-	    UIO_SYSSPACE, (uap->fd & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) != 0 ?
+	error = kern_utimensat(td, uap->fd.fd, path, UIO_SYSSPACE, ts,
+	    UIO_SYSSPACE, (uap->fd.flags & CLOUDABI_LOOKUP_SYMLINK_FOLLOW) ?
 	    0 : AT_SYMLINK_NOFOLLOW);
 	cloudabi_freestr(path);
 	return (error);
@@ -751,7 +752,7 @@ cloudabi_sys_file_unlink(struct thread *td,
 	if (error != 0)
 		return (error);
 
-	if (uap->flag & CLOUDABI_UNLINK_REMOVEDIR)
+	if (uap->flags & CLOUDABI_UNLINK_REMOVEDIR)
 		error = kern_rmdirat(td, uap->fd, path, UIO_SYSSPACE);
 	else
 		error = kern_unlinkat(td, uap->fd, path, UIO_SYSSPACE, 0);
diff --git a/sys/compat/cloudabi/cloudabi_futex.c b/sys/compat/cloudabi/cloudabi_futex.c
index aec2f3318f34..bc01265d9801 100644
--- a/sys/compat/cloudabi/cloudabi_futex.c
+++ b/sys/compat/cloudabi/cloudabi_futex.c
@@ -37,8 +37,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/umtx.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 #include <compat/cloudabi/cloudabi_util.h>
 
 /*
diff --git a/sys/compat/cloudabi/cloudabi_mem.c b/sys/compat/cloudabi/cloudabi_mem.c
index 9d82673ae741..34ee14ab2235 100644
--- a/sys/compat/cloudabi/cloudabi_mem.c
+++ b/sys/compat/cloudabi/cloudabi_mem.c
@@ -30,8 +30,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/mman.h>
 #include <sys/sysproto.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 
 /* Converts CloudABI's memory protection flags to FreeBSD's. */
 static int
diff --git a/sys/compat/cloudabi/cloudabi_proc.c b/sys/compat/cloudabi/cloudabi_proc.c
index 8d0b6e76958a..139af2cfc73a 100644
--- a/sys/compat/cloudabi/cloudabi_proc.c
+++ b/sys/compat/cloudabi/cloudabi_proc.c
@@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/syscallsubr.h>
 #include <sys/unistd.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 
 int
 cloudabi_sys_proc_exec(struct thread *td,
diff --git a/sys/compat/cloudabi/cloudabi_proto.h b/sys/compat/cloudabi/cloudabi_proto.h
index e4baffd96a44..95271fd3a575 100644
--- a/sys/compat/cloudabi/cloudabi_proto.h
+++ b/sys/compat/cloudabi/cloudabi_proto.h
@@ -30,5 +30,7 @@
  * calls. Unfortunately, we don't have a separate system call table for
  * those, so rely on the system call table from COMPAT_CLOUDABI64.
  */
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
+
+#include <contrib/cloudabi/cloudabi64_types.h>
+
 #include <compat/cloudabi64/cloudabi64_proto.h>
diff --git a/sys/compat/cloudabi/cloudabi_sock.c b/sys/compat/cloudabi/cloudabi_sock.c
index cdccdffcf3d5..b66f0ab13504 100644
--- a/sys/compat/cloudabi/cloudabi_sock.c
+++ b/sys/compat/cloudabi/cloudabi_sock.c
@@ -43,8 +43,9 @@ __FBSDID("$FreeBSD$");
 
 #include <netinet/in.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 #include <compat/cloudabi/cloudabi_util.h>
 
 /* Converts FreeBSD's struct sockaddr to CloudABI's cloudabi_sockaddr_t. */
@@ -117,12 +118,12 @@ cloudabi_sys_sock_accept(struct thread *td,
 
 	if (uap->buf == NULL) {
 		/* Only return the new file descriptor number. */
-		return (kern_accept(td, uap->s, NULL, NULL, NULL));
+		return (kern_accept(td, uap->sock, NULL, NULL, NULL));
 	} else {
 		/* Also return properties of the new socket descriptor. */
 		sal = MAX(sizeof(struct sockaddr_in),
 		    sizeof(struct sockaddr_in6));
-		error = kern_accept(td, uap->s, (void *)&sa, &sal, NULL);
+		error = kern_accept(td, uap->sock, (void *)&sa, &sal, NULL);
 		if (error != 0)
 			return (error);
 
@@ -143,7 +144,7 @@ cloudabi_sys_sock_bind(struct thread *td,
 	error = copyin_sockaddr_un(uap->path, uap->pathlen, &sun);
 	if (error != 0)
 		return (error);
-	return (kern_bindat(td, uap->fd, uap->s, (struct sockaddr *)&sun));
+	return (kern_bindat(td, uap->fd, uap->sock, (struct sockaddr *)&sun));
 }
 
 int
@@ -156,7 +157,8 @@ cloudabi_sys_sock_connect(struct thread *td,
 	error = copyin_sockaddr_un(uap->path, uap->pathlen, &sun);
 	if (error != 0)
 		return (error);
-	return (kern_connectat(td, uap->fd, uap->s, (struct sockaddr *)&sun));
+	return (kern_connectat(td, uap->fd, uap->sock,
+	    (struct sockaddr *)&sun));
 }
 
 int
@@ -164,7 +166,7 @@ cloudabi_sys_sock_listen(struct thread *td,
     struct cloudabi_sys_sock_listen_args *uap)
 {
 	struct listen_args listen_args = {
-		.s = uap->s,
+		.s = uap->sock,
 		.backlog = uap->backlog,
 	};
 
@@ -176,7 +178,7 @@ cloudabi_sys_sock_shutdown(struct thread *td,
     struct cloudabi_sys_sock_shutdown_args *uap)
 {
 	struct shutdown_args shutdown_args = {
-		.s = uap->fd,
+		.s = uap->sock,
 	};
 
 	switch (uap->how) {
@@ -207,7 +209,7 @@ cloudabi_sys_sock_stat_get(struct thread *td,
 	struct socket *so;
 	int error;
 
-	error = getsock_cap(td, uap->fd, cap_rights_init(&rights,
+	error = getsock_cap(td, uap->sock, cap_rights_init(&rights,
 	    CAP_GETSOCKOPT, CAP_GETPEERNAME, CAP_GETSOCKNAME), &fp, NULL);
 	if (error != 0)
 		return (error);
@@ -243,7 +245,7 @@ cloudabi_sys_sock_stat_get(struct thread *td,
 
 	/* Set ss_state. */
 	if ((so->so_options & SO_ACCEPTCONN) != 0)
-		ss.ss_state |= CLOUDABI_SOCKSTAT_ACCEPTCONN;
+		ss.ss_state |= CLOUDABI_SOCKSTATE_ACCEPTCONN;
 
 	fdrop(fp, td);
 	return (copyout(&ss, uap->buf, sizeof(ss)));
diff --git a/sys/compat/cloudabi/cloudabi_syscalldefs.h b/sys/compat/cloudabi/cloudabi_syscalldefs.h
deleted file mode 100644
index fc86effee050..000000000000
--- a/sys/compat/cloudabi/cloudabi_syscalldefs.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2015 Nuxi, https://nuxi.nl/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _CLOUDABI_SYSCALLDEFS_H_
-#define	_CLOUDABI_SYSCALLDEFS_H_
-
-#ifdef _KERNEL
-#include <sys/types.h>
-#include <sys/stdint.h>
-
-#define	alignas		_Alignas
-#define	alignof		_Alignof
-#define	static_assert	_Static_assert
-#else
-#include <assert.h>
-#include <stdalign.h>
-#include <stddef.h>
-#include <stdint.h>
-#endif
-
-/* Import machine-independent CloudABI definitions. */
-#include <contrib/cloudabi/syscalldefs_mi.h>
-
-#endif
diff --git a/sys/compat/cloudabi/cloudabi_thread.c b/sys/compat/cloudabi/cloudabi_thread.c
index 8aee708de948..37dc79438e35 100644
--- a/sys/compat/cloudabi/cloudabi_thread.c
+++ b/sys/compat/cloudabi/cloudabi_thread.c
@@ -31,8 +31,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/sched.h>
 #include <sys/syscallsubr.h>
 
+#include <contrib/cloudabi/cloudabi_types_common.h>
+
 #include <compat/cloudabi/cloudabi_proto.h>
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
 
 int
 cloudabi_sys_thread_exit(struct thread *td,
diff --git a/sys/compat/cloudabi/cloudabi_util.h b/sys/compat/cloudabi/cloudabi_util.h
index 10da229a2104..52eb48cb5bfa 100644
--- a/sys/compat/cloudabi/cloudabi_util.h
+++ b/sys/compat/cloudabi/cloudabi_util.h
@@ -30,7 +30,7 @@
 
 #include <sys/socket.h>
 
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
+#include <contrib/cloudabi/cloudabi_types_common.h>
 
 struct file;
 struct thread;
diff --git a/sys/compat/cloudabi64/Makefile b/sys/compat/cloudabi64/Makefile
index 3fbef579da9c..83d27a30d300 100644
--- a/sys/compat/cloudabi64/Makefile
+++ b/sys/compat/cloudabi64/Makefile
@@ -8,5 +8,7 @@ sysent: cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
 
 cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
     cloudabi64_syscalls.c cloudabi64_systrace_args.c: \
-    ../../kern/makesyscalls.sh syscalls.master syscalls.conf
-	sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
+    ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls.master \
+    syscalls.conf
+	sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls.master \
+	    syscalls.conf
diff --git a/sys/compat/cloudabi64/cloudabi64_fd.c b/sys/compat/cloudabi64/cloudabi64_fd.c
index b2fd67d8aaf8..7d0c69a8a80b 100644
--- a/sys/compat/cloudabi64/cloudabi64_fd.c
+++ b/sys/compat/cloudabi64/cloudabi64_fd.c
@@ -34,7 +34,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/uio.h>
 
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
+#include <contrib/cloudabi/cloudabi64_types.h>
+
 #include <compat/cloudabi64/cloudabi64_proto.h>
 
 /* Copies in 64-bit iovec structures from userspace. */
diff --git a/sys/compat/cloudabi64/cloudabi64_module.c b/sys/compat/cloudabi64/cloudabi64_module.c
index ca8ecf4affca..60100c5a6717 100644
--- a/sys/compat/cloudabi64/cloudabi64_module.c
+++ b/sys/compat/cloudabi64/cloudabi64_module.c
@@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysent.h>
 #include <sys/systm.h>
 
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
+#include <contrib/cloudabi/cloudabi64_types.h>
+
 #include <compat/cloudabi64/cloudabi64_util.h>
 
 register_t *
diff --git a/sys/compat/cloudabi64/cloudabi64_poll.c b/sys/compat/cloudabi64/cloudabi64_poll.c
index c8f18112229c..e44d69f2e973 100644
--- a/sys/compat/cloudabi64/cloudabi64_poll.c
+++ b/sys/compat/cloudabi64/cloudabi64_poll.c
@@ -30,9 +30,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/syscallsubr.h>
 
+#include <contrib/cloudabi/cloudabi64_types.h>
+
 #include <compat/cloudabi/cloudabi_util.h>
 
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
 #include <compat/cloudabi64/cloudabi64_proto.h>
 
 /* Converts a FreeBSD signal number to a CloudABI signal number. */
@@ -248,7 +249,7 @@ cloudabi64_sys_poll(struct thread *td, struct cloudabi64_sys_poll_args *uap)
 	 * Bandaid to support CloudABI futex constructs that are not
 	 * implemented through FreeBSD's kqueue().
 	 */
-	if (uap->nevents == 1) {
+	if (uap->nsubscriptions == 1) {
 		cloudabi64_subscription_t sub;
 		cloudabi64_event_t ev = {};
 		int error;
@@ -291,7 +292,7 @@ cloudabi64_sys_poll(struct thread *td, struct cloudabi64_sys_poll_args *uap)
 			td->td_retval[0] = 1;
 			return (copyout(&ev, uap->out, sizeof(ev)));
 		}
-	} else if (uap->nevents == 2) {
+	} else if (uap->nsubscriptions == 2) {
 		cloudabi64_subscription_t sub[2];
 		cloudabi64_event_t ev[2] = {};
 		int error;
@@ -365,7 +366,7 @@ cloudabi64_sys_poll(struct thread *td, struct cloudabi64_sys_poll_args *uap)
 		}
 	}
 
-	return (kern_kevent_anonymous(td, uap->nevents, &copyops));
+	return (kern_kevent_anonymous(td, uap->nsubscriptions, &copyops));
 }
 
 int
diff --git a/sys/compat/cloudabi64/cloudabi64_sock.c b/sys/compat/cloudabi64/cloudabi64_sock.c
index c612a32dfc70..e6b9c9416253 100644
--- a/sys/compat/cloudabi64/cloudabi64_sock.c
+++ b/sys/compat/cloudabi64/cloudabi64_sock.c
@@ -35,9 +35,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/uio.h>
 
+#include <contrib/cloudabi/cloudabi64_types.h>
+
 #include <compat/cloudabi/cloudabi_util.h>
 
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
 #include <compat/cloudabi64/cloudabi64_proto.h>
 
 static MALLOC_DEFINE(M_SOCKET, "socket", "CloudABI socket");
@@ -82,7 +83,7 @@ cloudabi64_sys_sock_recv(struct thread *td,
 		msghdr.msg_flags |= MSG_WAITALL;
 
 	/* TODO(ed): Add file descriptor passing. */
-	error = kern_recvit(td, uap->s, &msghdr, UIO_SYSSPACE, NULL);
+	error = kern_recvit(td, uap->sock, &msghdr, UIO_SYSSPACE, NULL);
 	free(msghdr.msg_iov, M_SOCKET);
 	if (error != 0)
 		return (error);
@@ -132,7 +133,7 @@ cloudabi64_sys_sock_send(struct thread *td,
 		flags |= MSG_EOR;
 
 	/* TODO(ed): Add file descriptor passing. */
-	error = kern_sendit(td, uap->s, &msghdr, flags, NULL, UIO_USERSPACE);
+	error = kern_sendit(td, uap->sock, &msghdr, flags, NULL, UIO_USERSPACE);
 	free(msghdr.msg_iov, M_SOCKET);
 	if (error != 0)
 		return (error);
diff --git a/sys/compat/cloudabi64/cloudabi64_syscalldefs.h b/sys/compat/cloudabi64/cloudabi64_syscalldefs.h
deleted file mode 100644
index d57f5f4a9297..000000000000
--- a/sys/compat/cloudabi64/cloudabi64_syscalldefs.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2015 Nuxi, https://nuxi.nl/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _CLOUDABI64_SYSCALLDEFS_H_
-#define	_CLOUDABI64_SYSCALLDEFS_H_
-
-#include <sys/types.h>
-
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
-
-typedef uint64_t cloudabi64_size_t;
-typedef uint64_t cloudabi64_uintptr_t;
-
-/* Import machine-dependent CloudABI definitions for 64-bit systems. */
-#define	IDENT(ident)	cloudabi64_##ident
-#define	PTR(type)	cloudabi64_uintptr_t
-#include <contrib/cloudabi/syscalldefs_md.h>
-#undef IDENT
-#undef PTR
-
-#endif
diff --git a/sys/compat/cloudabi64/cloudabi64_systrace_args.c b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
index b3176aa3018e..33ed931d34da 100644
--- a/sys/compat/cloudabi64/cloudabi64_systrace_args.c
+++ b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
@@ -75,7 +75,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct cloudabi64_sys_fd_pread_args *p = params;
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->iov; /* const cloudabi64_iovec_t * */
-		iarg[2] = p->iovcnt; /* cloudabi64_size_t */
+		uarg[2] = p->iovcnt; /* size_t */
 		iarg[3] = p->offset; /* cloudabi_filesize_t */
 		*n_args = 4;
 		break;
@@ -85,7 +85,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct cloudabi64_sys_fd_pwrite_args *p = params;
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->iov; /* const cloudabi64_ciovec_t * */
-		iarg[2] = p->iovcnt; /* cloudabi64_size_t */
+		uarg[2] = p->iovcnt; /* size_t */
 		iarg[3] = p->offset; /* cloudabi_filesize_t */
 		*n_args = 4;
 		break;
@@ -95,7 +95,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct cloudabi64_sys_fd_read_args *p = params;
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->iov; /* const cloudabi64_iovec_t * */
-		iarg[2] = p->iovcnt; /* cloudabi64_size_t */
+		uarg[2] = p->iovcnt; /* size_t */
 		*n_args = 3;
 		break;
 	}
@@ -145,7 +145,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct cloudabi64_sys_fd_write_args *p = params;
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->iov; /* const cloudabi64_ciovec_t * */
-		iarg[2] = p->iovcnt; /* cloudabi64_size_t */
+		uarg[2] = p->iovcnt; /* size_t */
 		*n_args = 3;
 		break;
 	}
@@ -193,7 +193,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi_sys_file_open */
 	case 21: {
 		struct cloudabi_sys_file_open_args *p = params;
-		iarg[0] = p->fd; /* cloudabi_lookup_t */
+		iarg[0] = p->dirfd; /* cloudabi_lookup_t */
 		uarg[1] = (intptr_t) p->path; /* const char * */
 		uarg[2] = p->pathlen; /* size_t */
 		iarg[3] = p->oflags; /* cloudabi_oflags_t */
@@ -217,7 +217,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->path; /* const char * */
 		uarg[2] = p->pathlen; /* size_t */
-		uarg[3] = (intptr_t) p->buf; /* void * */
+		uarg[3] = (intptr_t) p->buf; /* char * */
 		uarg[4] = p->bufsize; /* size_t */
 		*n_args = 5;
 		break;
@@ -289,7 +289,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->path; /* const char * */
 		uarg[2] = p->pathlen; /* size_t */
-		iarg[3] = p->flag; /* cloudabi_ulflags_t */
+		iarg[3] = p->flags; /* cloudabi_ulflags_t */
 		*n_args = 4;
 		break;
 	}
@@ -369,7 +369,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct cloudabi64_sys_poll_args *p = params;
 		uarg[0] = (intptr_t) p->in; /* const cloudabi64_subscription_t * */
 		uarg[1] = (intptr_t) p->out; /* cloudabi64_event_t * */
-		iarg[2] = p->nevents; /* cloudabi64_size_t */
+		uarg[2] = p->nsubscriptions; /* size_t */
 		*n_args = 3;
 		break;
 	}
@@ -414,7 +414,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi_sys_sock_accept */
 	case 45: {
 		struct cloudabi_sys_sock_accept_args *p = params;
-		iarg[0] = p->s; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->buf; /* cloudabi_sockstat_t * */
 		*n_args = 2;
 		break;
@@ -422,7 +422,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi_sys_sock_bind */
 	case 46: {
 		struct cloudabi_sys_sock_bind_args *p = params;
-		iarg[0] = p->s; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->fd; /* cloudabi_fd_t */
 		uarg[2] = (intptr_t) p->path; /* const char * */
 		uarg[3] = p->pathlen; /* size_t */
@@ -432,7 +432,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi_sys_sock_connect */
 	case 47: {
 		struct cloudabi_sys_sock_connect_args *p = params;
-		iarg[0] = p->s; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->fd; /* cloudabi_fd_t */
 		uarg[2] = (intptr_t) p->path; /* const char * */
 		uarg[3] = p->pathlen; /* size_t */
@@ -442,7 +442,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi_sys_sock_listen */
 	case 48: {
 		struct cloudabi_sys_sock_listen_args *p = params;
-		iarg[0] = p->s; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->backlog; /* cloudabi_backlog_t */
 		*n_args = 2;
 		break;
@@ -450,7 +450,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi64_sys_sock_recv */
 	case 49: {
 		struct cloudabi64_sys_sock_recv_args *p = params;
-		iarg[0] = p->s; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->in; /* const cloudabi64_recv_in_t * */
 		uarg[2] = (intptr_t) p->out; /* cloudabi64_recv_out_t * */
 		*n_args = 3;
@@ -459,7 +459,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi64_sys_sock_send */
 	case 50: {
 		struct cloudabi64_sys_sock_send_args *p = params;
-		iarg[0] = p->s; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->in; /* const cloudabi64_send_in_t * */
 		uarg[2] = (intptr_t) p->out; /* cloudabi64_send_out_t * */
 		*n_args = 3;
@@ -468,7 +468,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi_sys_sock_shutdown */
 	case 51: {
 		struct cloudabi_sys_sock_shutdown_args *p = params;
-		iarg[0] = p->fd; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->how; /* cloudabi_sdflags_t */
 		*n_args = 2;
 		break;
@@ -476,7 +476,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* cloudabi_sys_sock_stat_get */
 	case 52: {
 		struct cloudabi_sys_sock_stat_get_args *p = params;
-		iarg[0] = p->fd; /* cloudabi_fd_t */
+		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->buf; /* cloudabi_sockstat_t * */
 		iarg[2] = p->flags; /* cloudabi_ssflags_t */
 		*n_args = 3;
@@ -514,9 +514,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct cloudabi64_sys_poll_fd_args *p = params;
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->in; /* const cloudabi64_subscription_t * */
-		iarg[2] = p->nin; /* cloudabi64_size_t */
+		uarg[2] = p->nin; /* size_t */
 		uarg[3] = (intptr_t) p->out; /* cloudabi64_event_t * */
-		iarg[4] = p->nout; /* cloudabi64_size_t */
+		uarg[4] = p->nout; /* size_t */
 		uarg[5] = (intptr_t) p->timeout; /* const cloudabi64_subscription_t * */
 		*n_args = 6;
 		break;
@@ -630,7 +630,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "const cloudabi64_iovec_t *";
 			break;
 		case 2:
-			p = "cloudabi64_size_t";
+			p = "size_t";
 			break;
 		case 3:
 			p = "cloudabi_filesize_t";
@@ -649,7 +649,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "const cloudabi64_ciovec_t *";
 			break;
 		case 2:
-			p = "cloudabi64_size_t";
+			p = "size_t";
 			break;
 		case 3:
 			p = "cloudabi_filesize_t";
@@ -668,7 +668,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "const cloudabi64_iovec_t *";
 			break;
 		case 2:
-			p = "cloudabi64_size_t";
+			p = "size_t";
 			break;
 		default:
 			break;
@@ -752,7 +752,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "const cloudabi64_ciovec_t *";
 			break;
 		case 2:
-			p = "cloudabi64_size_t";
+			p = "size_t";
 			break;
 		default:
 			break;
@@ -891,7 +891,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "size_t";
 			break;
 		case 3:
-			p = "void *";
+			p = "char *";
 			break;
 		case 4:
 			p = "size_t";
@@ -1171,7 +1171,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "cloudabi64_event_t *";
 			break;
 		case 2:
-			p = "cloudabi64_size_t";
+			p = "size_t";
 			break;
 		default:
 			break;
@@ -1406,13 +1406,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "const cloudabi64_subscription_t *";
 			break;
 		case 2:
-			p = "cloudabi64_size_t";
+			p = "size_t";
 			break;
 		case 3:
 			p = "cloudabi64_event_t *";
 			break;
 		case 4:
-			p = "cloudabi64_size_t";
+			p = "size_t";
 			break;
 		case 5:
 			p = "const cloudabi64_subscription_t *";
@@ -1475,17 +1475,17 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	/* cloudabi64_sys_fd_pread */
 	case 8:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "size_t";
 		break;
 	/* cloudabi64_sys_fd_pwrite */
 	case 9:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "size_t";
 		break;
 	/* cloudabi64_sys_fd_read */
 	case 10:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "size_t";
 		break;
 	/* cloudabi_sys_fd_replace */
 	case 11:
@@ -1515,7 +1515,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	/* cloudabi64_sys_fd_write */
 	case 16:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "size_t";
 		break;
 	/* cloudabi_sys_file_advise */
 	case 17:
@@ -1630,7 +1630,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	/* cloudabi64_sys_poll */
 	case 39:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "size_t";
 		break;
 	/* cloudabi_sys_proc_exec */
 	case 40:
@@ -1677,12 +1677,12 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	/* cloudabi64_sys_sock_recv */
 	case 49:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "void";
 		break;
 	/* cloudabi64_sys_sock_send */
 	case 50:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "void";
 		break;
 	/* cloudabi_sys_sock_shutdown */
 	case 51:
@@ -1714,7 +1714,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	/* cloudabi64_sys_poll_fd */
 	case 57:
 		if (ndx == 0 || ndx == 1)
-			p = "cloudabi64_size_t";
+			p = "size_t";
 		break;
 	default:
 		break;
diff --git a/sys/compat/cloudabi64/cloudabi64_thread.c b/sys/compat/cloudabi64/cloudabi64_thread.c
index 04b1782329b9..51961f8ad29b 100644
--- a/sys/compat/cloudabi64/cloudabi64_thread.c
+++ b/sys/compat/cloudabi64/cloudabi64_thread.c
@@ -30,7 +30,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/systm.h>
 
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
+#include <contrib/cloudabi/cloudabi64_types.h>
+
 #include <compat/cloudabi64/cloudabi64_proto.h>
 #include <compat/cloudabi64/cloudabi64_util.h>
 
diff --git a/sys/compat/cloudabi64/cloudabi64_util.h b/sys/compat/cloudabi64/cloudabi64_util.h
index 180a01eb59be..dcec70ece5f4 100644
--- a/sys/compat/cloudabi64/cloudabi64_util.h
+++ b/sys/compat/cloudabi64/cloudabi64_util.h
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/imgact_elf.h>
 
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
+#include <contrib/cloudabi/cloudabi64_types.h>
 
 struct image_params;
 struct thread;
diff --git a/sys/compat/cloudabi64/syscalls.master b/sys/compat/cloudabi64/syscalls.master
deleted file mode 100644
index 5fd6f7eb3dfb..000000000000
--- a/sys/compat/cloudabi64/syscalls.master
+++ /dev/null
@@ -1,220 +0,0 @@
- $FreeBSD$
-
-; System call table for CloudABI.
-;
-; All system calls that do not use any machine-dependent data types are
-; prefixed with cloudabi_sys_. The others are called cloudabi64_sys_.
-
-#include <sys/sysent.h>
-#include <sys/sysproto.h>
-
-#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
-#include <compat/cloudabi64/cloudabi64_proto.h>
-
-0	AUE_NULL	STD	{ cloudabi_timestamp_t \
-					cloudabi_sys_clock_res_get( \
-					cloudabi_clockid_t clock_id); }
-1	AUE_NULL	STD	{ cloudabi_timestamp_t \
-					cloudabi_sys_clock_time_get( \
-					cloudabi_clockid_t clock_id, \
-					cloudabi_timestamp_t precision); }
-
-2	AUE_NULL	STD	{ void cloudabi_sys_condvar_signal( \
-					cloudabi_condvar_t *condvar, \
-					cloudabi_mflags_t scope, \
-					cloudabi_nthreads_t nwaiters); }
-
-3	AUE_NULL	STD	{ void cloudabi_sys_fd_close( \
-					cloudabi_fd_t fd); }
-4	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_fd_create1( \
-					cloudabi_filetype_t type); }
-5	AUE_NULL	STD	{ void cloudabi_sys_fd_create2( \
-					cloudabi_filetype_t type); }
-6	AUE_NULL	STD	{ void cloudabi_sys_fd_datasync( \
-					cloudabi_fd_t fd); }
-7	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_fd_dup( \
-					cloudabi_fd_t from); }
-8	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_fd_pread( \
-					cloudabi_fd_t fd, \
-					const cloudabi64_iovec_t *iov, \
-					cloudabi64_size_t iovcnt, \
-					cloudabi_filesize_t offset); }
-9	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_fd_pwrite( \
-					cloudabi_fd_t fd, \
-					const cloudabi64_ciovec_t *iov, \
-					cloudabi64_size_t iovcnt, \
-					cloudabi_filesize_t offset); }
-10	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_fd_read( \
-					cloudabi_fd_t fd, \
-					const cloudabi64_iovec_t *iov, \
-					cloudabi64_size_t iovcnt); }
-11	AUE_NULL	STD	{ void cloudabi_sys_fd_replace( \
-					cloudabi_fd_t from, \
-					cloudabi_fd_t to); }
-12	AUE_NULL	STD	{ cloudabi_filesize_t cloudabi_sys_fd_seek( \
-					cloudabi_fd_t fd, \
-					cloudabi_filedelta_t offset, \
-					cloudabi_whence_t whence); }
-13	AUE_NULL	STD	{ void cloudabi_sys_fd_stat_get( \
-					cloudabi_fd_t fd, \
-					cloudabi_fdstat_t *buf); }
-14	AUE_NULL	STD	{ void cloudabi_sys_fd_stat_put( \
-					cloudabi_fd_t fd, \
-					const cloudabi_fdstat_t *buf, \
-					cloudabi_fdsflags_t flags); }
-15	AUE_NULL	STD	{ void cloudabi_sys_fd_sync( \
-					cloudabi_fd_t fd); }
-16	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_fd_write( \
-					cloudabi_fd_t fd, \
-					const cloudabi64_ciovec_t *iov, \
-					cloudabi64_size_t iovcnt); }
-
-17	AUE_NULL	STD	{ void cloudabi_sys_file_advise( \
-					cloudabi_fd_t fd, \
-					cloudabi_filesize_t offset, \
-					cloudabi_filesize_t len, \
-					cloudabi_advice_t advice); }
-18	AUE_NULL	STD	{ void cloudabi_sys_file_allocate( \
-					cloudabi_fd_t fd, \
-					cloudabi_filesize_t offset, \
-					cloudabi_filesize_t len); }
-19	AUE_NULL	STD	{ void cloudabi_sys_file_create( \
-					cloudabi_fd_t fd, \
-					const char *path, size_t pathlen, \
-					cloudabi_filetype_t type); }
-20	AUE_NULL	STD	{ void cloudabi_sys_file_link( \
-					cloudabi_lookup_t fd1, \
-					const char *path1, size_t path1len, \
-					cloudabi_fd_t fd2, \
-					const char *path2, size_t path2len); }
-21	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_file_open( \
-					cloudabi_lookup_t fd, \
-					const char *path, size_t pathlen, \
-					cloudabi_oflags_t oflags, \
-					const cloudabi_fdstat_t *fds); }
-22	AUE_NULL	STD	{ size_t cloudabi_sys_file_readdir( \
-					cloudabi_fd_t fd, \
-					void *buf, size_t nbyte, \
-					cloudabi_dircookie_t cookie); }
-23	AUE_NULL	STD	{ size_t cloudabi_sys_file_readlink( \
-					cloudabi_fd_t fd, \
-					const char *path, size_t pathlen, \
-					void *buf, size_t bufsize); }
-24	AUE_NULL	STD	{ void cloudabi_sys_file_rename( \
-					cloudabi_fd_t oldfd, \
-					const char *old, size_t oldlen, \
-					cloudabi_fd_t newfd, \
-					const char *new, size_t newlen); }
-25	AUE_NULL	STD	{ void cloudabi_sys_file_stat_fget( \
-					cloudabi_fd_t fd, \
-					cloudabi_filestat_t *buf); }
-26	AUE_NULL	STD	{ void cloudabi_sys_file_stat_fput( \
-					cloudabi_fd_t fd, \
-					const cloudabi_filestat_t *buf, \
-					cloudabi_fsflags_t flags); }
-27	AUE_NULL	STD	{ void cloudabi_sys_file_stat_get( \
-					cloudabi_lookup_t fd, \
-					const char *path, size_t pathlen, \
-					cloudabi_filestat_t *buf); }
-28	AUE_NULL	STD	{ void cloudabi_sys_file_stat_put( \
-					cloudabi_lookup_t fd, \
-					const char *path, size_t pathlen, \
-					const cloudabi_filestat_t *buf, \
-					cloudabi_fsflags_t flags); }
-29	AUE_NULL	STD	{ void cloudabi_sys_file_symlink( \
-					const char *path1, size_t path1len, \
-					cloudabi_fd_t fd, \
-					const char *path2, size_t path2len); }
-30	AUE_NULL	STD	{ void cloudabi_sys_file_unlink( \
-					cloudabi_fd_t fd, \
-					const char *path, size_t pathlen, \
-					cloudabi_ulflags_t flag); }
-
-31	AUE_NULL	STD	{ void cloudabi_sys_lock_unlock( \
-					cloudabi_lock_t *lock, \
-					cloudabi_mflags_t scope); }
-
-32	AUE_NULL	STD	{ void cloudabi_sys_mem_advise( \
-					void *addr, size_t len, \
-					cloudabi_advice_t advice); }
-33	AUE_NULL	STD	{ void cloudabi_sys_mem_lock( \
-					const void *addr, size_t len); }
-34	AUE_NULL	STD	{ void cloudabi_sys_mem_map( \
-					void *addr, size_t len, \
-					cloudabi_mprot_t prot, \
-					cloudabi_mflags_t flags, \
-					cloudabi_fd_t fd, \
-					cloudabi_filesize_t off); }
-35	AUE_NULL	STD	{ void cloudabi_sys_mem_protect( \
-					void *addr, size_t len, \
-					cloudabi_mprot_t prot); }
-36	AUE_NULL	STD	{ void cloudabi_sys_mem_sync( \
-					void *addr, size_t len, \
-					cloudabi_msflags_t flags); }
-37	AUE_NULL	STD	{ void cloudabi_sys_mem_unlock( \
-					const void *addr, size_t len); }
-38	AUE_NULL	STD	{ void cloudabi_sys_mem_unmap( \
-					void * addr, size_t len); }
-
-39	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_poll( \
-					const cloudabi64_subscription_t *in, \
-					cloudabi64_event_t *out, \
-					cloudabi64_size_t nevents); }
-
-40	AUE_NULL	STD	{ void cloudabi_sys_proc_exec( \
-					cloudabi_fd_t fd, const void *data, \
-					size_t datalen, \
-					const cloudabi_fd_t *fds, \
-					size_t fdslen); }
-41	AUE_NULL	STD	{ void cloudabi_sys_proc_exit( \
-					cloudabi_exitcode_t rval); }
-42	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_proc_fork(); }
-43	AUE_NULL	STD	{ void cloudabi_sys_proc_raise( \
-					cloudabi_signal_t sig); }
-
-44	AUE_NULL	STD	{ void cloudabi_sys_random_get( \
-					void *buf, size_t nbyte); }
-
-45	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_sock_accept( \
-					cloudabi_fd_t s, \
-					cloudabi_sockstat_t *buf); }
-46	AUE_NULL	STD	{ void cloudabi_sys_sock_bind( \
-					cloudabi_fd_t s, cloudabi_fd_t fd, \
-					const char *path, size_t pathlen); }
-47	AUE_NULL	STD	{ void cloudabi_sys_sock_connect( \
-					cloudabi_fd_t s, cloudabi_fd_t fd, \
-					const char *path, size_t pathlen); }
-48	AUE_NULL	STD	{ void cloudabi_sys_sock_listen( \
-					cloudabi_fd_t s, \
-					cloudabi_backlog_t backlog); }
-49	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_sock_recv( \
-					cloudabi_fd_t s, \
-					const cloudabi64_recv_in_t *in, \
-					cloudabi64_recv_out_t *out); }
-50	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_sock_send( \
-					cloudabi_fd_t s, \
-					const cloudabi64_send_in_t *in, \
-					cloudabi64_send_out_t *out); }
-51	AUE_NULL	STD	{ void cloudabi_sys_sock_shutdown( \
-					cloudabi_fd_t fd, \
-					cloudabi_sdflags_t how); }
-52	AUE_NULL	STD	{ void cloudabi_sys_sock_stat_get( \
-					cloudabi_fd_t fd, \
-					cloudabi_sockstat_t *buf, \
-					cloudabi_ssflags_t flags); }
-
-53	AUE_NULL	STD	{ cloudabi_tid_t cloudabi64_sys_thread_create( \
-					cloudabi64_threadattr_t *attr); }
-54	AUE_NULL	STD	{ void cloudabi_sys_thread_exit( \
-					cloudabi_lock_t *lock, \
-					cloudabi_mflags_t scope); }
-55	AUE_NULL	STD	{ void cloudabi_sys_thread_tcb_set(void *tcb); }
-56	AUE_NULL	STD	{ void cloudabi_sys_thread_yield(); }
-
-57	AUE_NULL	STD	{ cloudabi64_size_t cloudabi64_sys_poll_fd( \
-					cloudabi_fd_t fd, \
-					const cloudabi64_subscription_t *in, \
-					cloudabi64_size_t nin, \
-					cloudabi64_event_t *out, \
-					cloudabi64_size_t nout, \
-					const cloudabi64_subscription_t *timeout); }