diff --git a/imports/getrandom/Cargo.toml b/imports/getrandom/Cargo.toml index 83a913e12..8af921ce4 100644 --- a/imports/getrandom/Cargo.toml +++ b/imports/getrandom/Cargo.toml @@ -32,11 +32,11 @@ wasm-bindgen-test = "0.3.18" [target.'cfg(target_os = "xous")'.dependencies] xous-names = { package = "xous-api-names", version = "0.9.62" } xous = "0.9.64" -xous-ipc = "0.10.1" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } +flatipc = { path = "../../libs/flatipc" } [features] # Implement std-only traits for getrandom::Error diff --git a/imports/getrandom/src/xous.rs b/imports/getrandom/src/xous.rs index 85fd10326..c493f73d4 100644 --- a/imports/getrandom/src/xous.rs +++ b/imports/getrandom/src/xous.rs @@ -2,7 +2,7 @@ use core::mem::MaybeUninit; use core::sync::atomic::AtomicU32; use core::sync::atomic::Ordering; -use xous_ipc::Buffer; +use flatipc::{IntoIpc, Ipc}; /// Fill `dest` with random bytes from the system's preferred random number /// source. @@ -21,9 +21,10 @@ use crate::util::slice_as_uninit; static TRNG_CONN: AtomicU32 = AtomicU32::new(0); -#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] +#[derive(Debug, flatipc::Ipc)] +#[repr(C)] struct TrngBuf { - pub data: [u32; 1024], + pub data: [u32; 1020], pub len: u16, } @@ -47,15 +48,14 @@ pub fn getrandom_inner(dest: &mut [MaybeUninit]) -> Result<(), crate::error: } pub fn fill_buf(data: &mut [u32]) { - let mut tb = TrngBuf { data: [0; 1024], len: 0 }; + let mut tb = TrngBuf { data: [0; 1020], len: 0 }; assert!(data.len() <= tb.data.len()); tb.len = data.len() as u16; - let mut buf = Buffer::into_buf(tb).unwrap(); + let mut buf = tb.into_ipc(); buf.lend_mut(TRNG_CONN.load(Ordering::SeqCst), 1 /* FillTrng */).unwrap(); - let rtb = buf.as_flat::().unwrap(); - assert!(usize::from(rtb.len) == data.len()); - // FIXME - // data.copy_from_slice(&rtb.data); + assert!(usize::from(buf.len) == data.len()); + let len = buf.len as usize; + data.copy_from_slice(&buf.data[..len]); } pub fn next_u32() -> u32 { @@ -119,19 +119,18 @@ fn fill_bytes(dest: &mut [MaybeUninit]) { // initializing the empty 4k-page... let remainder = dest.chunks_exact_mut(4096).into_remainder(); if remainder.len() != 0 { - let mut tb = TrngBuf { data: [0; 1024], len: 0 }; + let mut tb = TrngBuf { data: [0; 1020], len: 0 }; tb.len = if remainder.len() % 4 == 0 { (remainder.len() / 4) as u16 } else { 1 + (remainder.len() / 4) as u16 }; - let mut buf = Buffer::into_buf(tb).unwrap(); + let mut buf = tb.into_ipc(); buf.lend_mut(TRNG_CONN.load(Ordering::SeqCst), 1 /* FillTrng */).unwrap(); - let rtb = buf.as_flat::().unwrap(); // transform the whole buffer into a ret_u8 slice (including trailing zeroes) let ret_u8 = - unsafe { core::slice::from_raw_parts(rtb.data.as_ptr() as *mut u8, rtb.data.len() * 4) }; + unsafe { core::slice::from_raw_parts(buf.data.as_ptr() as *mut u8, buf.data.len() * 4) }; // we've allocated an extra remainder word to handle the last word overflow, if anything // we'll end up throwing away a couple of unused bytes, but better than copying zeroes! remainder.copy_from_slice(slice_as_uninit(&ret_u8[..remainder.len()]));