Initial reorg.

This is largely the same as #305, but updated for the current tree.

crates/wasi-common/src/hostcalls/fs.rs

@@ -0,0 +1,256 @@
+#![allow(non_camel_case_types)]
+use crate::ctx::WasiCtx;
+use crate::{wasi, wasi32};
+
+hostcalls! {
+    pub unsafe fn fd_close(wasi_ctx: &mut WasiCtx, fd: wasi::__wasi_fd_t,) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_datasync(wasi_ctx: &WasiCtx, fd: wasi::__wasi_fd_t,) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_pread(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        iovs_ptr: wasi32::uintptr_t,
+        iovs_len: wasi32::size_t,
+        offset: wasi::__wasi_filesize_t,
+        nread: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_pwrite(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        iovs_ptr: wasi32::uintptr_t,
+        iovs_len: wasi32::size_t,
+        offset: wasi::__wasi_filesize_t,
+        nwritten: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_read(
+        wasi_ctx: &mut WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        iovs_ptr: wasi32::uintptr_t,
+        iovs_len: wasi32::size_t,
+        nread: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_renumber(
+        wasi_ctx: &mut WasiCtx,
+        from: wasi::__wasi_fd_t,
+        to: wasi::__wasi_fd_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_seek(
+        wasi_ctx: &mut WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        offset: wasi::__wasi_filedelta_t,
+        whence: wasi::__wasi_whence_t,
+        newoffset: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_tell(
+        wasi_ctx: &mut WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        newoffset: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_fdstat_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        fdstat_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_fdstat_set_flags(
+        wasi_ctx: &WasiCtx,
+        fd: wasi::__wasi_fd_t,
+        fdflags: wasi::__wasi_fdflags_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_fdstat_set_rights(
+        wasi_ctx: &mut WasiCtx,
+        fd: wasi::__wasi_fd_t,
+        fs_rights_base: wasi::__wasi_rights_t,
+        fs_rights_inheriting: wasi::__wasi_rights_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_sync(wasi_ctx: &WasiCtx, fd: wasi::__wasi_fd_t,) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_write(
+        wasi_ctx: &mut WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        iovs_ptr: wasi32::uintptr_t,
+        iovs_len: wasi32::size_t,
+        nwritten: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_advise(
+        wasi_ctx: &WasiCtx,
+        fd: wasi::__wasi_fd_t,
+        offset: wasi::__wasi_filesize_t,
+        len: wasi::__wasi_filesize_t,
+        advice: wasi::__wasi_advice_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_allocate(
+        wasi_ctx: &WasiCtx,
+        fd: wasi::__wasi_fd_t,
+        offset: wasi::__wasi_filesize_t,
+        len: wasi::__wasi_filesize_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_create_directory(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        dirfd: wasi::__wasi_fd_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_link(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        old_dirfd: wasi::__wasi_fd_t,
+        old_flags: wasi::__wasi_lookupflags_t,
+        old_path_ptr: wasi32::uintptr_t,
+        old_path_len: wasi32::size_t,
+        new_dirfd: wasi::__wasi_fd_t,
+        new_path_ptr: wasi32::uintptr_t,
+        new_path_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_open(
+        wasi_ctx: &mut WasiCtx,
+        memory: &mut [u8],
+        dirfd: wasi::__wasi_fd_t,
+        dirflags: wasi::__wasi_lookupflags_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+        oflags: wasi::__wasi_oflags_t,
+        fs_rights_base: wasi::__wasi_rights_t,
+        fs_rights_inheriting: wasi::__wasi_rights_t,
+        fs_flags: wasi::__wasi_fdflags_t,
+        fd_out_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_readdir(
+        wasi_ctx: &mut WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        buf: wasi32::uintptr_t,
+        buf_len: wasi32::size_t,
+        cookie: wasi::__wasi_dircookie_t,
+        buf_used: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_readlink(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        dirfd: wasi::__wasi_fd_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+        buf_ptr: wasi32::uintptr_t,
+        buf_len: wasi32::size_t,
+        buf_used: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_rename(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        old_dirfd: wasi::__wasi_fd_t,
+        old_path_ptr: wasi32::uintptr_t,
+        old_path_len: wasi32::size_t,
+        new_dirfd: wasi::__wasi_fd_t,
+        new_path_ptr: wasi32::uintptr_t,
+        new_path_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_filestat_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        filestat_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_filestat_set_times(
+        wasi_ctx: &WasiCtx,
+        fd: wasi::__wasi_fd_t,
+        st_atim: wasi::__wasi_timestamp_t,
+        st_mtim: wasi::__wasi_timestamp_t,
+        fst_flags: wasi::__wasi_fstflags_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_filestat_set_size(
+        wasi_ctx: &WasiCtx,
+        fd: wasi::__wasi_fd_t,
+        st_size: wasi::__wasi_filesize_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_filestat_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        dirfd: wasi::__wasi_fd_t,
+        dirflags: wasi::__wasi_lookupflags_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+        filestat_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_filestat_set_times(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        dirfd: wasi::__wasi_fd_t,
+        dirflags: wasi::__wasi_lookupflags_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+        st_atim: wasi::__wasi_timestamp_t,
+        st_mtim: wasi::__wasi_timestamp_t,
+        fst_flags: wasi::__wasi_fstflags_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_symlink(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        old_path_ptr: wasi32::uintptr_t,
+        old_path_len: wasi32::size_t,
+        dirfd: wasi::__wasi_fd_t,
+        new_path_ptr: wasi32::uintptr_t,
+        new_path_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_unlink_file(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        dirfd: wasi::__wasi_fd_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn path_remove_directory(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        dirfd: wasi::__wasi_fd_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_prestat_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        prestat_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn fd_prestat_dir_name(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        fd: wasi::__wasi_fd_t,
+        path_ptr: wasi32::uintptr_t,
+        path_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+}

crates/wasi-common/src/hostcalls/misc.rs

@@ -0,0 +1,83 @@
+#![allow(non_camel_case_types)]
+use crate::ctx::WasiCtx;
+use crate::{wasi, wasi32};
+use log::trace;
+
+use wasi_common_cbindgen::wasi_common_cbindgen;
+
+#[wasi_common_cbindgen]
+pub unsafe fn proc_exit(rval: wasi::__wasi_exitcode_t) {
+    trace!("proc_exit(rval={:?})", rval);
+    // TODO: Rather than call std::process::exit here, we should trigger a
+    // stack unwind similar to a trap.
+    std::process::exit(rval as i32);
+}
+
+#[wasi_common_cbindgen]
+pub unsafe fn proc_raise(
+    _wasi_ctx: &WasiCtx,
+    _memory: &mut [u8],
+    _sig: wasi::__wasi_signal_t,
+) -> wasi::__wasi_errno_t {
+    unimplemented!("proc_raise")
+}
+
+hostcalls! {
+    pub unsafe fn args_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        argv_ptr: wasi32::uintptr_t,
+        argv_buf: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn args_sizes_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        argc_ptr: wasi32::uintptr_t,
+        argv_buf_size_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn environ_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        environ_ptr: wasi32::uintptr_t,
+        environ_buf: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn environ_sizes_get(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        environ_count_ptr: wasi32::uintptr_t,
+        environ_size_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn random_get(
+        memory: &mut [u8],
+        buf_ptr: wasi32::uintptr_t,
+        buf_len: wasi32::size_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn clock_res_get(
+        memory: &mut [u8],
+        clock_id: wasi::__wasi_clockid_t,
+        resolution_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn clock_time_get(
+        memory: &mut [u8],
+        clock_id: wasi::__wasi_clockid_t,
+        precision: wasi::__wasi_timestamp_t,
+        time_ptr: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn poll_oneoff(
+        wasi_ctx: &WasiCtx,
+        memory: &mut [u8],
+        input: wasi32::uintptr_t,
+        output: wasi32::uintptr_t,
+        nsubscriptions: wasi32::size_t,
+        nevents: wasi32::uintptr_t,
+    ) -> wasi::__wasi_errno_t;
+
+    pub unsafe fn sched_yield() -> wasi::__wasi_errno_t;
+}

crates/wasi-common/src/hostcalls/mod.rs

@@ -0,0 +1,7 @@
+mod fs;
+mod misc;
+mod sock;
+
+pub use self::fs::*;
+pub use self::misc::*;
+pub use self::sock::*;

crates/wasi-common/src/hostcalls/sock.rs

@@ -0,0 +1,43 @@
+#![allow(non_camel_case_types)]
+#![allow(unused_unsafe)]
+#![allow(unused)]
+use crate::ctx::WasiCtx;
+use crate::{wasi, wasi32};
+use wasi_common_cbindgen::wasi_common_cbindgen;
+
+#[wasi_common_cbindgen]
+pub unsafe fn sock_recv(
+    wasi_ctx: &WasiCtx,
+    memory: &mut [u8],
+    sock: wasi::__wasi_fd_t,
+    ri_data: wasi32::uintptr_t,
+    ri_data_len: wasi32::size_t,
+    ri_flags: wasi::__wasi_riflags_t,
+    ro_datalen: wasi32::uintptr_t,
+    ro_flags: wasi32::uintptr_t,
+) -> wasi::__wasi_errno_t {
+    unimplemented!("sock_recv")
+}
+
+#[wasi_common_cbindgen]
+pub unsafe fn sock_send(
+    wasi_ctx: &WasiCtx,
+    memory: &mut [u8],
+    sock: wasi::__wasi_fd_t,
+    si_data: wasi32::uintptr_t,
+    si_data_len: wasi32::size_t,
+    si_flags: wasi::__wasi_siflags_t,
+    so_datalen: wasi32::uintptr_t,
+) -> wasi::__wasi_errno_t {
+    unimplemented!("sock_send")
+}
+
+#[wasi_common_cbindgen]
+pub unsafe fn sock_shutdown(
+    wasi_ctx: &WasiCtx,
+    memory: &mut [u8],
+    sock: wasi::__wasi_fd_t,
+    how: wasi::__wasi_sdflags_t,
+) -> wasi::__wasi_errno_t {
+    unimplemented!("sock_shutdown")
+}