diff --git a/kernel/src/arch/hosted.rs b/kernel/src/arch/hosted.rs index 4a30a817c..353867a76 100644 --- a/kernel/src/arch/hosted.rs +++ b/kernel/src/arch/hosted.rs @@ -228,14 +228,13 @@ fn handle_connection( sliced_data.len(), msg.buf.len() ); - msg.buf.addr = - match MemoryAddress::new(Box::into_raw(sliced_data) - as *mut u8 - as usize) - { - Some(a) => a, - _ => unreachable!(), - }; + msg.buf = unsafe { + xous_kernel::MemoryRange::new( + Box::into_raw(sliced_data) as *mut u8 as usize, + msg.buf.len(), + ) + .unwrap() + }; } xous_kernel::Message::Scalar(_) | xous_kernel::Message::BlockingScalar(_) => (), @@ -255,12 +254,12 @@ fn handle_connection( sliced_data.len(), buf.len() ); - buf.addr = match MemoryAddress::new(Box::into_raw(sliced_data) - as *mut u8 - as usize) - { - Some(a) => a, - _ => unreachable!(), + *buf = unsafe { + xous_kernel::MemoryRange::new( + Box::into_raw(sliced_data) as *mut u8 as usize, + buf.len(), + ) + .unwrap() }; } _ => panic!("unsupported message type"), diff --git a/xous-rs/src/arch/hosted.rs b/xous-rs/src/arch/hosted.rs index add46d0d9..791c4cc2f 100644 --- a/xous-rs/src/arch/hosted.rs +++ b/xous-rs/src/arch/hosted.rs @@ -691,8 +691,7 @@ fn _xous_syscall_result(ret: &mut Result, thread_id: TID, server_connection: &Se assert_eq!(data.len(), data.capacity()); let len = data.len(); let addr = data.as_mut_ptr(); - memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap(); - memory_message.buf.size = crate::MemorySize::new(len).unwrap(); + memory_message.buf = unsafe { crate::MemoryRange::new(addr as _, len).unwrap() }; } _ => (), } diff --git a/xous-rs/src/arch/hosted/mem.rs b/xous-rs/src/arch/hosted/mem.rs index 76fc100c7..a217eeefc 100644 --- a/xous-rs/src/arch/hosted/mem.rs +++ b/xous-rs/src/arch/hosted/mem.rs @@ -21,8 +21,7 @@ pub fn map_memory_post( ) -> core::result::Result { let layout = Layout::from_size_align(range.len(), 4096).unwrap(); let new_mem = MemoryAddress::new(unsafe { alloc(layout) } as usize).ok_or(Error::BadAddress)?; - range.addr = new_mem; - Ok(range) + Ok(unsafe { MemoryRange::new(new_mem.get(), range.len()).unwrap() }) } pub fn unmap_memory_pre(_range: &MemoryRange) -> core::result::Result<(), Error> {