From ae97ca4e1468d481bfdda54c23420f1967044987 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 16 Aug 2021 12:15:23 +0800 Subject: [PATCH] xous: move rename `native` arch to `riscv` This will enable adding more architectures later. Signed-off-by: Sean Cross --- xous-rs/src/arch/{native => riscv}/mem.rs | 0 xous-rs/src/arch/{native => riscv}/mod.rs | 2 ++ xous-rs/src/arch/riscv/syscall.rs | 30 +++++++++++++++++++++++ 3 files changed, 32 insertions(+) rename xous-rs/src/arch/{native => riscv}/mem.rs (100%) rename xous-rs/src/arch/{native => riscv}/mod.rs (99%) create mode 100644 xous-rs/src/arch/riscv/syscall.rs diff --git a/xous-rs/src/arch/native/mem.rs b/xous-rs/src/arch/riscv/mem.rs similarity index 100% rename from xous-rs/src/arch/native/mem.rs rename to xous-rs/src/arch/riscv/mem.rs diff --git a/xous-rs/src/arch/native/mod.rs b/xous-rs/src/arch/riscv/mod.rs similarity index 99% rename from xous-rs/src/arch/native/mod.rs rename to xous-rs/src/arch/riscv/mod.rs index 27461798c..d3153abfe 100644 --- a/xous-rs/src/arch/native/mod.rs +++ b/xous-rs/src/arch/riscv/mod.rs @@ -3,6 +3,8 @@ use core::convert::TryInto; mod mem; pub use mem::*; +mod syscall; +pub use syscall::*; #[derive(Debug, Clone, Copy, PartialEq)] pub struct ProcessArgs { diff --git a/xous-rs/src/arch/riscv/syscall.rs b/xous-rs/src/arch/riscv/syscall.rs new file mode 100644 index 000000000..91227d1a5 --- /dev/null +++ b/xous-rs/src/arch/riscv/syscall.rs @@ -0,0 +1,30 @@ +extern "Rust" { + fn _xous_syscall( + nr: usize, + a1: usize, + a2: usize, + a3: usize, + a4: usize, + a5: usize, + a6: usize, + a7: usize, + ret: &mut crate::Result, + ); +} + +use crate::definitions::SysCallResult; +use crate::syscall::SysCall; + +pub fn syscall(call: SysCall) -> SysCallResult { + let mut ret = crate::Result::Ok; + let args = call.as_args(); + unsafe { + _xous_syscall( + args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], &mut ret, + ) + }; + match ret { + crate::Result::Error(e) => Err(e), + other => Ok(other), + } +}