WASI: Simplify byref translation.

Avoid needlessly copying data from wasm into the host for output
parameters, and factor out the `.unwrap()` for translating pointers
when writing to output parameters.

wasmtime-wasi/src/syscalls.rs

@@ -210,16 +210,14 @@ syscalls! {
         );
 
         let vmctx = &mut *vmctx;
-        #[allow(unused_assignments)]
+        let mut host_argc = 0;
-        let mut host_argc = match decode_usize_byref(vmctx, argc) {
+        if let Err(e) = decode_usize_byref(vmctx, argc) {
-            Ok(host_argc) => host_argc,
+            return return_encoded_errno(e);
-            Err(e) => return return_encoded_errno(e),
+        }
-        };
+        let mut host_argv_buf_size = 0;
-        #[allow(unused_assignments)]
+        if let Err(e) = decode_usize_byref(vmctx, argv_buf_size) {
-        let mut host_argv_buf_size = match decode_usize_byref(vmctx, argv_buf_size) {
+            return return_encoded_errno(e);
-            Ok(host_argv_buf_size) => host_argv_buf_size,
+        }
-            Err(e) => return return_encoded_errno(e),
-        };
 
         let vmctx = &mut *vmctx;
         let argv_environ = get_argv_environ(vmctx);
@@ -227,10 +225,10 @@ syscalls! {
         let e = host::wasmtime_ssp_args_sizes_get(argv_environ, &mut host_argc, &mut host_argv_buf_size);
 
         trace!("     | *argc={:?}", host_argc);
-        encode_usize_byref(vmctx, argc, host_argc).unwrap();
+        encode_usize_byref(vmctx, argc, host_argc);
 
         trace!("     | *argv_buf_size={:?}", host_argv_buf_size);
-        encode_usize_byref(vmctx, argv_buf_size, host_argv_buf_size).unwrap();
+        encode_usize_byref(vmctx, argv_buf_size, host_argv_buf_size);
 
         return_encoded_errno(e)
     }
@@ -248,15 +246,15 @@ syscalls! {
 
         let vmctx = &mut *vmctx;
         let clock_id = decode_clockid(clock_id);
-        let mut host_resolution = match decode_timestamp_byref(vmctx, resolution) {
+        let mut host_resolution = 0;
-            Ok(host_resolution) => host_resolution,
+        if let Err(e) = decode_timestamp_byref(vmctx, resolution) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_clock_res_get(clock_id, &mut host_resolution);
 
         trace!("     | *resolution={:?}", host_resolution);
-        encode_timestamp_byref(vmctx, resolution, host_resolution).unwrap();
+        encode_timestamp_byref(vmctx, resolution, host_resolution);
 
         return_encoded_errno(e)
     }
@@ -277,15 +275,15 @@ syscalls! {
         let vmctx = &mut *vmctx;
         let clock_id = decode_clockid(clock_id);
         let precision = decode_timestamp(precision);
-        let mut host_time = match decode_timestamp_byref(vmctx, time) {
+        let mut host_time = 0;
-            Ok(host_time) => host_time,
+        if let Err(e) = decode_timestamp_byref(vmctx, time) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_clock_time_get(clock_id, precision, &mut host_time);
 
         trace!("     | *time={:?}", host_time);
-        encode_timestamp_byref(vmctx, time, host_time).unwrap();
+        encode_timestamp_byref(vmctx, time, host_time);
 
         return_encoded_errno(e)
     }
@@ -343,16 +341,14 @@ syscalls! {
         );
 
         let vmctx = &mut *vmctx;
-        #[allow(unused_assignments)]
+        let mut host_environ_count = 0;
-        let mut host_environ_count = match decode_usize_byref(vmctx, environ_count) {
+        if let Err(e) = decode_usize_byref(vmctx, environ_count) {
-            Ok(host_environ_count) => host_environ_count,
+            return return_encoded_errno(e);
-            Err(e) => return return_encoded_errno(e),
+        }
-        };
+        let mut host_environ_buf_size = 0;
-        #[allow(unused_assignments)]
+        if let Err(e) = decode_usize_byref(vmctx, environ_buf_size) {
-        let mut host_environ_buf_size = match decode_usize_byref(vmctx, environ_buf_size) {
+            return return_encoded_errno(e);
-            Ok(host_environ_buf_size) => host_environ_buf_size,
+        }
-            Err(e) => return return_encoded_errno(e),
-        };
 
         let vmctx = &mut *vmctx;
         let argv_environ = get_argv_environ(vmctx);
@@ -360,10 +356,10 @@ syscalls! {
         let e = host::wasmtime_ssp_environ_sizes_get(argv_environ, &mut host_environ_count, &mut host_environ_buf_size);
 
         trace!("     | *environ_count={:?}", host_environ_count);
-        encode_usize_byref(vmctx, environ_count, host_environ_count).unwrap();
+        encode_usize_byref(vmctx, environ_count, host_environ_count);
 
         trace!("     | *environ_buf_size={:?}", host_environ_buf_size);
-        encode_usize_byref(vmctx, environ_buf_size, host_environ_buf_size).unwrap();
+        encode_usize_byref(vmctx, environ_buf_size, host_environ_buf_size);
 
         return_encoded_errno(e)
     }
@@ -378,14 +374,14 @@ syscalls! {
         let vmctx = &mut *vmctx;
         let prestats = get_prestats(vmctx);
         let fd = decode_fd(fd);
-        let mut host_buf = match decode_prestat_byref(vmctx, buf) {
+        let mut host_buf = std::mem::zeroed();
-            Ok(host_buf) => host_buf,
+        if let Err(e) = decode_prestat_byref(vmctx, buf) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_prestat_get(prestats, fd, &mut host_buf);
 
-        encode_prestat_byref(vmctx, buf, host_buf).unwrap();
+        encode_prestat_byref(vmctx, buf, host_buf);
 
         return_encoded_errno(e)
     }
@@ -468,10 +464,10 @@ syscalls! {
             Err(e) => return return_encoded_errno(e),
         };
         let offset = decode_filesize(offset);
-        let mut host_nread = match decode_usize_byref(vmctx, nread) {
+        let mut host_nread = 0;
-            Ok(host_nread) => host_nread,
+        if let Err(e) = decode_usize_byref(vmctx, nread) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_pread(
             curfds,
@@ -483,7 +479,7 @@ syscalls! {
         );
 
         trace!("     | *nread={:?}", host_nread);
-        encode_usize_byref(vmctx, nread, host_nread).unwrap();
+        encode_usize_byref(vmctx, nread, host_nread);
 
         return_encoded_errno(e)
     }
@@ -513,10 +509,10 @@ syscalls! {
             Err(e) => return return_encoded_errno(e),
         };
         let offset = decode_filesize(offset);
-        let mut host_nwritten = match decode_usize_byref(vmctx, nwritten) {
+        let mut host_nwritten = 0;
-            Ok(host_nwritten) => host_nwritten,
+        if let Err(e) = decode_usize_byref(vmctx, nwritten) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_pwrite(
             curfds,
@@ -528,7 +524,7 @@ syscalls! {
         );
 
         trace!("     | *nwritten={:?}", host_nwritten);
-        encode_usize_byref(vmctx, nwritten, host_nwritten).unwrap();
+        encode_usize_byref(vmctx, nwritten, host_nwritten);
 
         return_encoded_errno(e)
     }
@@ -555,15 +551,15 @@ syscalls! {
             Ok(iovs) => iovs,
             Err(e) => return return_encoded_errno(e),
         };
-        let mut host_nread = match decode_usize_byref(vmctx, nread) {
+        let mut host_nread = 0;
-            Ok(host_nread) => host_nread,
+        if let Err(e) = decode_usize_byref(vmctx, nread) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_read(curfds, fd, iovs.as_ptr(), iovs.len(), &mut host_nread);
 
         trace!("     | *nread={:?}", host_nread);
-        encode_usize_byref(vmctx, nread, host_nread).unwrap();
+        encode_usize_byref(vmctx, nread, host_nread);
 
         return_encoded_errno(e)
     }
@@ -605,15 +601,15 @@ syscalls! {
         let fd = decode_fd(fd);
         let offset = decode_filedelta(offset);
         let whence = decode_whence(whence);
-        let mut host_newoffset = match decode_filesize_byref(vmctx, newoffset) {
+        let mut host_newoffset = 0;
-            Ok(host_newoffset) => host_newoffset,
+        if let Err(e) = decode_filesize_byref(vmctx, newoffset) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_seek(curfds, fd, offset, whence, &mut host_newoffset);
 
         trace!("     | *newoffset={:?}", host_newoffset);
-        encode_filesize_byref(vmctx, newoffset, host_newoffset).unwrap();
+        encode_filesize_byref(vmctx, newoffset, host_newoffset);
 
         return_encoded_errno(e)
     }
@@ -628,15 +624,15 @@ syscalls! {
         let vmctx = &mut *vmctx;
         let curfds = get_curfds(vmctx);
         let fd = decode_fd(fd);
-        let mut host_newoffset = match decode_filesize_byref(vmctx, newoffset) {
+        let mut host_newoffset = 0;
-            Ok(host_newoffset) => host_newoffset,
+        if let Err(e) = decode_filesize_byref(vmctx, newoffset) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_tell(curfds, fd, &mut host_newoffset);
 
         trace!("     | *newoffset={:?}", host_newoffset);
-        encode_filesize_byref(vmctx, newoffset, host_newoffset).unwrap();
+        encode_filesize_byref(vmctx, newoffset, host_newoffset);
 
         return_encoded_errno(e)
     }
@@ -651,15 +647,15 @@ syscalls! {
         let vmctx = &mut *vmctx;
         let curfds = get_curfds(vmctx);
         let fd = decode_fd(fd);
-        let mut host_buf = match decode_fdstat_byref(vmctx, buf) {
+        let mut host_buf = std::mem::zeroed();
-            Ok(host_buf) => host_buf,
+        if let Err(e) = decode_fdstat_byref(vmctx, buf) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_fdstat_get(curfds, fd, &mut host_buf);
 
         trace!("     | *buf={:?}", host_buf);
-        encode_fdstat_byref(vmctx, buf, host_buf).unwrap();
+        encode_fdstat_byref(vmctx, buf, host_buf);
 
         return_encoded_errno(e)
     }
@@ -746,15 +742,15 @@ syscalls! {
             Ok(iovs) => iovs,
             Err(e) => return return_encoded_errno(e),
         };
-        let mut host_nwritten = match decode_usize_byref(vmctx, nwritten) {
+        let mut host_nwritten = 0;
-            Ok(host_nwritten) => host_nwritten,
+        if let Err(e) = decode_usize_byref(vmctx, nwritten) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_write(curfds, fd, iovs.as_ptr(), iovs.len(), &mut host_nwritten);
 
         trace!("     | *nwritten={:?}", host_nwritten);
-        encode_usize_byref(vmctx, nwritten, host_nwritten).unwrap();
+        encode_usize_byref(vmctx, nwritten, host_nwritten);
 
         return_encoded_errno(e)
     }
@@ -916,10 +912,10 @@ syscalls! {
         let fs_rights_base = decode_rights(fs_rights_base);
         let fs_rights_inheriting = decode_rights(fs_rights_inheriting);
         let fs_flags = decode_fdflags(fs_flags);
-        let mut host_fd = match decode_fd_byref(vmctx, fd) {
+        let mut host_fd = 0;
-            Ok(host_fd) => host_fd,
+        if let Err(e) = decode_fd_byref(vmctx, fd) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         trace!("     | (path,path_len)={:?}", str_for_trace(path, path_len));
 
@@ -937,7 +933,7 @@ syscalls! {
         );
 
         trace!("     | *fd={:?}", host_fd);
-        encode_fd_byref(vmctx, fd, host_fd).unwrap();
+        encode_fd_byref(vmctx, fd, host_fd);
 
         return_encoded_errno(e)
     }
@@ -967,10 +963,10 @@ syscalls! {
             Err(e) => return return_encoded_errno(e),
         };
         let cookie = decode_dircookie(cookie);
-        let mut host_buf_used = match decode_usize_byref(vmctx, buf_used) {
+        let mut host_buf_used = 0;
-            Ok(host_buf_used) => host_buf_used,
+        if let Err(e) = decode_usize_byref(vmctx, buf_used) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         trace!("     | (buf,buf_len)={:?}", str_for_trace(buf, buf_len));
 
@@ -984,7 +980,7 @@ syscalls! {
         );
 
         trace!("     | *buf_used={:?}", host_buf_used);
-        encode_usize_byref(vmctx, buf_used, host_buf_used).unwrap();
+        encode_usize_byref(vmctx, buf_used, host_buf_used);
 
         return_encoded_errno(e)
     }
@@ -1019,10 +1015,10 @@ syscalls! {
             Ok((buf, buf_len)) => (buf, buf_len),
             Err(e) => return return_encoded_errno(e),
         };
-        let mut host_buf_used = match decode_usize_byref(vmctx, buf_used) {
+        let mut host_buf_used = 0;
-            Ok(host_buf_used) => host_buf_used,
+        if let Err(e) = decode_usize_byref(vmctx, buf_used) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         trace!("     | (path,path_len)={:?}", str_for_trace(path, path_len));
 
@@ -1038,7 +1034,7 @@ syscalls! {
 
         trace!("     | *buf_used={:?}", host_buf_used);
         trace!("     | (buf,*buf_used)={:?}", str_for_trace(buf, host_buf_used));
-        encode_usize_byref(vmctx, buf_used, host_buf_used).unwrap();
+        encode_usize_byref(vmctx, buf_used, host_buf_used);
 
         return_encoded_errno(e)
     }
@@ -1093,15 +1089,15 @@ syscalls! {
         let vmctx = &mut *vmctx;
         let curfds = get_curfds(vmctx);
         let fd = decode_fd(fd);
-        let mut host_buf = match decode_filestat_byref(vmctx, buf) {
+        let mut host_buf = std::mem::zeroed();
-            Ok(host_buf) => host_buf,
+        if let Err(e) = decode_filestat_byref(vmctx, buf) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_fd_filestat_get(curfds, fd, &mut host_buf);
 
         trace!("     | *buf={:?}", host_buf);
-        encode_filestat_byref(vmctx, buf, host_buf).unwrap();
+        encode_filestat_byref(vmctx, buf, host_buf);
 
         return_encoded_errno(e)
     }
@@ -1178,17 +1174,17 @@ syscalls! {
             Ok((path, path_len)) => (path, path_len),
             Err(e) => return return_encoded_errno(e),
         };
-        let mut host_buf = match decode_filestat_byref(vmctx, buf) {
+        let mut host_buf = std::mem::zeroed();
-            Ok(host_buf) => host_buf,
+        if let Err(e) = decode_filestat_byref(vmctx, buf) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         trace!("     | (path,path_len)={:?}", str_for_trace(path, path_len));
 
         let e = host::wasmtime_ssp_path_filestat_get(curfds, fd, flags, path, path_len, &mut host_buf);
 
         trace!("     | *buf={:?}", host_buf);
-        encode_filestat_byref(vmctx, buf, host_buf).unwrap();
+        encode_filestat_byref(vmctx, buf, host_buf);
 
         return_encoded_errno(e)
     }
@@ -1350,10 +1346,10 @@ syscalls! {
             Ok(out) => out,
             Err(e) => return return_encoded_errno(e),
         };
-        let mut host_nevents = match decode_usize_byref(vmctx, nevents) {
+        let mut host_nevents = 0;
-            Ok(host_nevents) => host_nevents,
+        if let Err(e) = decode_usize_byref(vmctx, nevents) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         assert!(in_.len() == host_out.len());
 
@@ -1366,7 +1362,7 @@ syscalls! {
         );
 
         trace!("     | *nevents={:?}", host_nevents);
-        encode_usize_byref(vmctx, nevents, host_nevents).unwrap();
+        encode_usize_byref(vmctx, nevents, host_nevents);
 
         if log_enabled!(log::Level::Trace) {
             for (index, _event) in host_out.iter().enumerate() {
@@ -1444,14 +1440,14 @@ syscalls! {
             Err(e) => return return_encoded_errno(e),
         };
         let ri_flags = decode_riflags(ri_flags);
-        let mut host_ro_datalen = match decode_usize_byref(vmctx, ro_datalen) {
+        let mut host_ro_datalen = 0;
-            Ok(host_ro_datalen) => host_ro_datalen,
+        if let Err(e) = decode_usize_byref(vmctx, ro_datalen) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
-        let mut host_ro_flags = match decode_roflags_byref(vmctx, ro_flags) {
+        let mut host_ro_flags = 0;
-            Ok(host_ro_flags) => host_ro_flags,
+        if let Err(e) = decode_roflags_byref(vmctx, ro_flags) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_sock_recv(curfds, sock, ri_data.as_ptr(), ri_data.len(), ri_flags,
                                              &mut host_ro_datalen, &mut host_ro_flags);
@@ -1459,8 +1455,8 @@ syscalls! {
         // TODO: Format the output for tracing.
         trace!("     | *ro_datalen={}", host_ro_datalen);
         trace!("     | *ro_flags={}", host_ro_flags);
-        encode_usize_byref(vmctx, ro_datalen, host_ro_datalen).unwrap();
+        encode_usize_byref(vmctx, ro_datalen, host_ro_datalen);
-        encode_roflags_byref(vmctx, ro_flags, host_ro_flags).unwrap();
+        encode_roflags_byref(vmctx, ro_flags, host_ro_flags);
 
         return_encoded_errno(e)
     }
@@ -1487,15 +1483,15 @@ syscalls! {
             Err(e) => return return_encoded_errno(e),
         };
         let si_flags = decode_siflags(si_flags);
-        let mut host_so_datalen = match decode_usize_byref(vmctx, so_datalen) {
+        let mut host_so_datalen = 0;
-            Ok(so_datalen) => so_datalen,
+        if let Err(e) = decode_usize_byref(vmctx, so_datalen) {
-            Err(e) => return return_encoded_errno(e),
+            return return_encoded_errno(e);
-        };
+        }
 
         let e = host::wasmtime_ssp_sock_send(curfds, sock, si_data.as_ptr(), si_data.len(), si_flags, &mut host_so_datalen);
 
         trace!("     | *so_datalen={:?}", host_so_datalen);
-        encode_usize_byref(vmctx, so_datalen, host_so_datalen).unwrap();
+        encode_usize_byref(vmctx, so_datalen, host_so_datalen);
 
         return_encoded_errno(e)
     }

wasmtime-wasi/src/translate.rs

@@ -67,22 +67,17 @@ unsafe fn decode_ptr_to<T>(
 unsafe fn decode_pointee<T>(
     vmctx: &mut VMContext,
     ptr: wasm32::uintptr_t,
-) -> Result<T, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
-    let ptr = decode_ptr_to::<T>(vmctx, ptr)?;
+    // Check bounds and alignment.
-
+    decode_ptr_to::<T>(vmctx, ptr)?;
-    // Size and alignment are checked by `decode_ptr_to`.
+    Ok(())
-    Ok(ptr.read())
 }
 
-pub unsafe fn encode_pointee<T>(
+pub unsafe fn encode_pointee<T>(vmctx: &mut VMContext, ptr: wasm32::uintptr_t, t: T) {
-    vmctx: &mut VMContext,
+    // Bounds and alignment are checked in `decode_pointee`.
-    ptr: wasm32::uintptr_t,
+    let ptr = decode_ptr_to::<T>(vmctx, ptr).unwrap();
-    t: T,
-) -> Result<(), host::__wasi_errno_t> {
-    let ptr = decode_ptr_to::<T>(vmctx, ptr)?;
 
-    // Size and alignment are checked by `decode_ptr_to`.
+    ptr.write(t);
-    Ok(ptr.write(t))
 }
 
 pub unsafe fn decode_slice_of<T>(
@@ -102,34 +97,18 @@ pub unsafe fn decode_slice_of<T>(
     Ok((ptr, len))
 }
 
-pub fn decode_usize(len: wasm32::size_t) -> usize {
-    cast::usize(len)
-}
-
 pub fn encode_usize(len: usize) -> wasm32::size_t {
     cast::u32(len).unwrap()
 }
 
-pub fn decode_device(device: wasm32::__wasi_device_t) -> host::__wasi_device_t {
-    device
-}
-
 pub fn encode_device(device: host::__wasi_device_t) -> wasm32::__wasi_device_t {
     device
 }
 
-pub fn decode_inode(inode: wasm32::__wasi_inode_t) -> host::__wasi_inode_t {
-    inode
-}
-
 pub fn encode_inode(inode: host::__wasi_inode_t) -> wasm32::__wasi_inode_t {
     inode
 }
 
-pub fn decode_linkcount(linkcount: wasm32::__wasi_linkcount_t) -> host::__wasi_linkcount_t {
-    linkcount
-}
-
 pub fn encode_linkcount(linkcount: host::__wasi_linkcount_t) -> wasm32::__wasi_linkcount_t {
     linkcount
 }
@@ -208,10 +187,6 @@ pub fn decode_lookupflags(lookupflags: wasm32::__wasi_lookupflags_t) -> host::__
     lookupflags
 }
 
-pub fn decode_roflags(roflags: wasm32::__wasi_roflags_t) -> host::__wasi_roflags_t {
-    roflags
-}
-
 pub fn decode_oflags(oflags: wasm32::__wasi_oflags_t) -> host::__wasi_oflags_t {
     oflags
 }
@@ -224,18 +199,10 @@ pub fn decode_dircookie(dircookie: wasm32::__wasi_dircookie_t) -> host::__wasi_d
     dircookie
 }
 
-pub fn decode_preopentype(preopentype: wasm32::__wasi_preopentype_t) -> host::__wasi_preopentype_t {
-    preopentype
-}
-
 pub fn encode_preopentype(preopentype: host::__wasi_preopentype_t) -> wasm32::__wasi_preopentype_t {
     preopentype
 }
 
-pub fn decode_filetype(filetype: wasm32::__wasi_filetype_t) -> host::__wasi_filetype_t {
-    filetype
-}
-
 pub fn encode_filetype(filetype: host::__wasi_filetype_t) -> wasm32::__wasi_filetype_t {
     filetype
 }
@@ -470,39 +437,37 @@ pub unsafe fn encode_event_slice(
             vmctx,
             ptr + (i * size_of::<wasm32::__wasi_event_t>()) as u32,
             guest,
-        )
+        );
-        .unwrap();
     }
 }
 
 pub unsafe fn decode_fd_byref(
     vmctx: &mut VMContext,
     fd_ptr: wasm32::uintptr_t,
-) -> Result<host::__wasi_fd_t, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
-    decode_pointee::<wasm32::__wasi_fd_t>(vmctx, fd_ptr).map(decode_fd)
+    decode_pointee::<wasm32::__wasi_fd_t>(vmctx, fd_ptr)
 }
 
 pub unsafe fn encode_fd_byref(
     vmctx: &mut VMContext,
     fd_ptr: wasm32::uintptr_t,
     fd: host::__wasi_fd_t,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     encode_pointee::<wasm32::__wasi_fd_t>(vmctx, fd_ptr, wasm32::size_t::cast(fd))
 }
 
 pub unsafe fn decode_timestamp_byref(
     vmctx: &mut VMContext,
     timestamp_ptr: wasm32::uintptr_t,
-) -> Result<host::__wasi_timestamp_t, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
     decode_pointee::<wasm32::__wasi_timestamp_t>(vmctx, timestamp_ptr)
-        .map(host::__wasi_timestamp_t::cast)
 }
 
 pub unsafe fn encode_timestamp_byref(
     vmctx: &mut VMContext,
     timestamp_ptr: wasm32::uintptr_t,
     host_timestamp: host::__wasi_timestamp_t,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     encode_pointee::<wasm32::__wasi_timestamp_t>(
         vmctx,
         timestamp_ptr,
@@ -513,16 +478,15 @@ pub unsafe fn encode_timestamp_byref(
 pub unsafe fn decode_filesize_byref(
     vmctx: &mut VMContext,
     filesize_ptr: wasm32::uintptr_t,
-) -> Result<host::__wasi_filesize_t, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
     decode_pointee::<wasm32::__wasi_filesize_t>(vmctx, filesize_ptr)
-        .map(host::__wasi_filesize_t::cast)
 }
 
 pub unsafe fn encode_filesize_byref(
     vmctx: &mut VMContext,
     filesize_ptr: wasm32::uintptr_t,
     host_filesize: host::__wasi_filesize_t,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     encode_pointee::<wasm32::__wasi_filesize_t>(
         vmctx,
         filesize_ptr,
@@ -533,15 +497,15 @@ pub unsafe fn encode_filesize_byref(
 pub unsafe fn decode_roflags_byref(
     vmctx: &mut VMContext,
     roflags_ptr: wasm32::uintptr_t,
-) -> Result<host::__wasi_roflags_t, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
-    decode_pointee::<wasm32::__wasi_roflags_t>(vmctx, roflags_ptr).map(decode_roflags)
+    decode_pointee::<wasm32::__wasi_roflags_t>(vmctx, roflags_ptr)
 }
 
 pub unsafe fn encode_roflags_byref(
     vmctx: &mut VMContext,
     roflags_ptr: wasm32::uintptr_t,
     host_roflags: host::__wasi_roflags_t,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     encode_pointee::<wasm32::__wasi_roflags_t>(
         vmctx,
         roflags_ptr,
@@ -552,39 +516,31 @@ pub unsafe fn encode_roflags_byref(
 pub unsafe fn decode_usize_byref(
     vmctx: &mut VMContext,
     usize_ptr: wasm32::uintptr_t,
-) -> Result<usize, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
-    decode_pointee::<wasm32::size_t>(vmctx, usize_ptr).map(decode_usize)
+    decode_pointee::<wasm32::size_t>(vmctx, usize_ptr)
 }
 
 pub unsafe fn encode_usize_byref(
     vmctx: &mut VMContext,
     usize_ptr: wasm32::uintptr_t,
     host_usize: usize,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     encode_pointee::<wasm32::size_t>(vmctx, usize_ptr, wasm32::size_t::cast(host_usize).unwrap())
 }
 
 pub unsafe fn decode_prestat_byref(
     vmctx: &mut VMContext,
     prestat_ptr: wasm32::uintptr_t,
-) -> Result<host::__wasi_prestat_t, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
-    let wasm32_prestat = decode_pointee::<wasm32::__wasi_prestat_t>(vmctx, prestat_ptr)?;
+    decode_pointee::<wasm32::__wasi_prestat_t>(vmctx, prestat_ptr)?;
-
+    Ok(())
-    Ok(host::__wasi_prestat_t {
-        pr_type: decode_preopentype(wasm32_prestat.pr_type),
-        u: host::__wasi_prestat_t___wasi_prestat_u {
-            dir: host::__wasi_prestat_t___wasi_prestat_u___wasi_prestat_u_dir_t {
-                pr_name_len: decode_usize(wasm32_prestat.u.dir.pr_name_len),
-            },
-        },
-    })
 }
 
 pub unsafe fn encode_prestat_byref(
     vmctx: &mut VMContext,
     prestat_ptr: wasm32::uintptr_t,
     host_prestat: host::__wasi_prestat_t,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     let wasm32_prestat = wasm32::__wasi_prestat_t {
         pr_type: encode_preopentype(host_prestat.pr_type),
         u: wasm32::__wasi_prestat_t___wasi_prestat_u {
@@ -600,22 +556,16 @@ pub unsafe fn encode_prestat_byref(
 pub unsafe fn decode_fdstat_byref(
     vmctx: &mut VMContext,
     fdstat_ptr: wasm32::uintptr_t,
-) -> Result<host::__wasi_fdstat_t, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
-    let wasm32_fdstat = decode_pointee::<wasm32::__wasi_fdstat_t>(vmctx, fdstat_ptr)?;
+    decode_pointee::<wasm32::__wasi_fdstat_t>(vmctx, fdstat_ptr)?;
-
+    Ok(())
-    Ok(host::__wasi_fdstat_t {
-        fs_filetype: decode_filetype(wasm32_fdstat.fs_filetype),
-        fs_flags: decode_fdflags(wasm32_fdstat.fs_flags),
-        fs_rights_base: decode_rights(wasm32_fdstat.fs_rights_base),
-        fs_rights_inheriting: decode_rights(wasm32_fdstat.fs_rights_inheriting),
-    })
 }
 
 pub unsafe fn encode_fdstat_byref(
     vmctx: &mut VMContext,
     fdstat_ptr: wasm32::uintptr_t,
     host_fdstat: host::__wasi_fdstat_t,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     let wasm32_fdstat = wasm32::__wasi_fdstat_t {
         fs_filetype: encode_filetype(host_fdstat.fs_filetype),
         fs_flags: encode_fdflags(host_fdstat.fs_flags),
@@ -630,26 +580,16 @@ pub unsafe fn encode_fdstat_byref(
 pub unsafe fn decode_filestat_byref(
     vmctx: &mut VMContext,
     filestat_ptr: wasm32::uintptr_t,
-) -> Result<host::__wasi_filestat_t, host::__wasi_errno_t> {
+) -> Result<(), host::__wasi_errno_t> {
-    let wasm32_filestat = decode_pointee::<wasm32::__wasi_filestat_t>(vmctx, filestat_ptr)?;
+    decode_pointee::<wasm32::__wasi_filestat_t>(vmctx, filestat_ptr)?;
-
+    Ok(())
-    Ok(host::__wasi_filestat_t {
-        st_dev: decode_device(wasm32_filestat.st_dev),
-        st_ino: decode_inode(wasm32_filestat.st_ino),
-        st_filetype: decode_filetype(wasm32_filestat.st_filetype),
-        st_nlink: decode_linkcount(wasm32_filestat.st_nlink),
-        st_size: decode_filesize(wasm32_filestat.st_size),
-        st_atim: decode_timestamp(wasm32_filestat.st_atim),
-        st_mtim: decode_timestamp(wasm32_filestat.st_mtim),
-        st_ctim: decode_timestamp(wasm32_filestat.st_ctim),
-    })
 }
 
 pub unsafe fn encode_filestat_byref(
     vmctx: &mut VMContext,
     filestat_ptr: wasm32::uintptr_t,
     host_filestat: host::__wasi_filestat_t,
-) -> Result<(), host::__wasi_errno_t> {
+) {
     let wasm32_filestat = wasm32::__wasi_filestat_t {
         st_dev: encode_device(host_filestat.st_dev),
         st_ino: encode_inode(host_filestat.st_ino),