Merge remote-tracking branch 'origin/feature/wasi' into feature/wasi

atkins126 · Apr 3, 2019 · 3b34ea6 · 3b34ea6
2 parents e9e7a33 + 10696c4
commit 3b34ea6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 77 deletions.
diff --git a/lib/wasi/src/syscalls/mod.rs b/lib/wasi/src/syscalls/mod.rs
@@ -489,13 +489,12 @@ pub fn fd_pread(
     debug!("wasi::fd_pread");
     let memory = ctx.memory(0);
 
-    if let ((Ok(iov_cells), Ok(nread_cell))) =
-        (iovs.deref(memory, 0, iovs_len), nread.deref(memory))
-    {
-        platform_fd_pread(fd, iov_cells, iovs_len, offset, nread_cell)
-    } else {
-        __WASI_EFAULT
-    }
+    let iov_cells = wasi_try!(iovs.deref(memory, 0, iovs_len));
+    let nread_cell = wasi_try!(nread.deref(memory));
+
+    unimplemented!();
+
+    __WASI_ESUCCESS
 }
 
 /// ### `fd_prestat_get()`

diff --git a/lib/wasi/src/syscalls/unix/linux.rs b/lib/wasi/src/syscalls/unix/linux.rs
diff --git a/lib/wasi/src/syscalls/unix/macos.rs b/lib/wasi/src/syscalls/unix/macos.rs
diff --git a/lib/wasi/src/syscalls/unix/mod.rs b/lib/wasi/src/syscalls/unix/mod.rs
@@ -1,15 +1,3 @@
-#[cfg(target_os = "linux")]
-pub mod linux;
-
-#[cfg(target_os = "macos")]
-pub mod macos;
-
-#[cfg(target_os = "linux")]
-pub use linux::*;
-
-#[cfg(target_os = "macos")]
-pub use macos::*;
-
 use crate::syscalls::types::*;
 use libc::{
     clock_getres, clock_gettime, timespec, CLOCK_MONOTONIC, CLOCK_PROCESS_CPUTIME_ID,

diff --git a/lib/wasi/src/syscalls/windows.rs b/lib/wasi/src/syscalls/windows.rs
@@ -15,13 +15,3 @@ pub fn platform_clock_time_get(
 ) -> __wasi_errno_t {
     unimplemented!()
 }
-
-pub fn platform_fd_pread(
-    fd: __wasi_fd_t,
-    iovs: &[Cell<__wasi_iovec_t>],
-    iovs_len: u32,
-    offset: __wasi_filesize_t,
-    nread: &Cell<u32>,
-) -> __wasi_errno_t {
-    unimplemented!()
-}