Implement libredox ABI

Cargo.lock

@@ -377,7 +377,7 @@ version = "0.1.0"
 dependencies = [
  "goblin",
  "plain",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
 ]
 
 [[package]]
@@ -394,6 +394,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "relibc"
 version = "0.2.5"
@@ -413,7 +422,7 @@ dependencies = [
  "ralloc",
  "rand",
  "redox-exec",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "sc",
  "spin 0.9.8",
  "unicode-width",

Cargo.toml

@@ -44,7 +44,7 @@ optional = true
 sc = "0.2.3"
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.3"
+redox_syscall = "0.4"
 spin = "0.9.0"
 redox-exec = { path = "src/platform/redox/redox-exec" }
 

src/platform/redox/libredox.rs

@@ -0,0 +1,93 @@
+use core::{slice, str};
+
+use libc::{c_int, mode_t};
+use syscall::{Error, Result, EMFILE, WaitFlags};
+
+pub type RawResult = usize;
+
+pub fn open(path: &str, oflag: c_int, mode: mode_t) -> Result<usize> {
+    let usize_fd = super::path::open(
+        path,
+        ((oflag as usize) & 0xFFFF_0000) | ((mode as usize) & 0xFFFF),
+    )?;
+
+    c_int::try_from(usize_fd).map_err(|_| {
+        let _ = syscall::close(usize_fd);
+        Error::new(EMFILE)
+    }).map(|f| f as usize)
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn redox_open_v1(path_base: *const u8, path_len: usize, flags: i32, mode: u16) -> RawResult {
+    Error::mux(open(str::from_utf8_unchecked(slice::from_raw_parts(path_base, path_len)), flags, mode as mode_t))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn redox_dup_v1(fd: usize, buf: *const u8, len: usize) -> RawResult {
+    Error::mux(syscall::dup(fd, core::slice::from_raw_parts(buf, len)))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_dup2_v1(old_fd: usize, new_fd: usize, buf: *const u8, len: usize) -> RawResult {
+    Error::mux(syscall::dup2(old_fd, new_fd, core::slice::from_raw_parts(buf, len)))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_read_v1(fd: usize, dst_base: *mut u8, dst_len: usize) -> RawResult {
+    Error::mux(syscall::read(fd, slice::from_raw_parts_mut(dst_base, dst_len)))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_write_v1(fd: usize, src_base: *const u8, src_len: usize) -> RawResult {
+    Error::mux(syscall::write(fd, slice::from_raw_parts(src_base, src_len)))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_fsync_v1(fd: usize) -> RawResult {
+    Error::mux(syscall::fsync(fd))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_fdatasync_v1(fd: usize) -> RawResult {
+    // TODO
+    Error::mux(syscall::fsync(fd))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_fchmod_v1(fd: usize, new_mode: u16) -> RawResult {
+    Error::mux(syscall::fchmod(fd, new_mode))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_fchown_v1(fd: usize, new_uid: u32, new_gid: u32) -> RawResult {
+    Error::mux(syscall::fchown(fd, new_uid, new_gid))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_fpath_v1(fd: usize, dst_base: *mut u8, dst_len: usize) -> RawResult {
+    Error::mux(syscall::fpath(fd, core::slice::from_raw_parts_mut(dst_base, dst_len)))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_close_v1(fd: usize) -> RawResult {
+    Error::mux(syscall::close(fd))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn redox_get_euid_v1() -> RawResult {
+    Error::mux(syscall::geteuid())
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_get_ruid_v1() -> RawResult {
+    Error::mux(syscall::getuid())
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_get_egid_v1() -> RawResult {
+    Error::mux(syscall::getegid())
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_get_rgid_v1() -> RawResult {
+    Error::mux(syscall::getgid())
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_setrens_v1(rns: usize, ens: usize) -> RawResult {
+    Error::mux(syscall::setrens(rns, ens))
+}
+#[no_mangle]
+pub unsafe extern "C" fn redox_waitpid_v1(pid: usize, status: *mut i32, options: i32) -> RawResult {
+    let mut sts = 0_usize;
+    let res = Error::mux(syscall::waitpid(pid, &mut sts, WaitFlags::from_bits_truncate(options as usize)));
+    status.write(sts as i32);
+    res
+}

src/platform/redox/mod.rs

@@ -43,6 +43,7 @@ mod clone;
 mod epoll;
 mod exec;
 mod extra;
+mod libredox;
 pub(crate) mod path;
 mod ptrace;
 mod signal;
@@ -765,19 +766,7 @@ impl Pal for Sys {
     fn open(path: &CStr, oflag: c_int, mode: mode_t) -> c_int {
         let path = path_from_c_str!(path);
 
-        match path::open(
-            path,
-            ((oflag as usize) & 0xFFFF_0000) | ((mode as usize) & 0xFFFF),
-        ) {
-            Ok(fd) => match c_int::try_from(fd) {
-                Ok(c_fd) => c_fd,
-                Err(_) => {
-                    let _ = syscall::close(fd);
-                    e(Err(Error::new(EMFILE))) as c_int
-                }
-            },
-            Err(error) => e(Err(error)) as c_int,
-        }
+        e(libredox::open(path, oflag, mode)) as c_int
     }
 
     fn pipe2(fds: &mut [c_int], flags: c_int) -> c_int {

src/platform/redox/redox-exec/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-redox_syscall = "0.3"
+redox_syscall = "0.4"
 # TODO: Update
 goblin = { version = "0.0.21", default-features = false, features = ["elf32", "elf64", "endian_fd"] }
 plain = "0.2"