hosted: fix MemoryRange refactor

This fixes the MemoryRange refactor where `.addr` and `.size` are now
private fields.

Previously it had only been tested on baremetal mode.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2021-06-24 18:02:28 +08:00
parent a99839ecd6
commit 7b7be0fe9e
3 changed files with 15 additions and 18 deletions

View file

@ -228,14 +228,13 @@ fn handle_connection(
sliced_data.len(), sliced_data.len(),
msg.buf.len() msg.buf.len()
); );
msg.buf.addr = msg.buf = unsafe {
match MemoryAddress::new(Box::into_raw(sliced_data) xous_kernel::MemoryRange::new(
as *mut u8 Box::into_raw(sliced_data) as *mut u8 as usize,
as usize) msg.buf.len(),
{ )
Some(a) => a, .unwrap()
_ => unreachable!(), };
};
} }
xous_kernel::Message::Scalar(_) xous_kernel::Message::Scalar(_)
| xous_kernel::Message::BlockingScalar(_) => (), | xous_kernel::Message::BlockingScalar(_) => (),
@ -255,12 +254,12 @@ fn handle_connection(
sliced_data.len(), sliced_data.len(),
buf.len() buf.len()
); );
buf.addr = match MemoryAddress::new(Box::into_raw(sliced_data) *buf = unsafe {
as *mut u8 xous_kernel::MemoryRange::new(
as usize) Box::into_raw(sliced_data) as *mut u8 as usize,
{ buf.len(),
Some(a) => a, )
_ => unreachable!(), .unwrap()
}; };
} }
_ => panic!("unsupported message type"), _ => panic!("unsupported message type"),

View file

@ -691,8 +691,7 @@ fn _xous_syscall_result(ret: &mut Result, thread_id: TID, server_connection: &Se
assert_eq!(data.len(), data.capacity()); assert_eq!(data.len(), data.capacity());
let len = data.len(); let len = data.len();
let addr = data.as_mut_ptr(); let addr = data.as_mut_ptr();
memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap(); memory_message.buf = unsafe { crate::MemoryRange::new(addr as _, len).unwrap() };
memory_message.buf.size = crate::MemorySize::new(len).unwrap();
} }
_ => (), _ => (),
} }

View file

@ -21,8 +21,7 @@ pub fn map_memory_post(
) -> core::result::Result<MemoryRange, Error> { ) -> core::result::Result<MemoryRange, Error> {
let layout = Layout::from_size_align(range.len(), 4096).unwrap(); let layout = Layout::from_size_align(range.len(), 4096).unwrap();
let new_mem = MemoryAddress::new(unsafe { alloc(layout) } as usize).ok_or(Error::BadAddress)?; let new_mem = MemoryAddress::new(unsafe { alloc(layout) } as usize).ok_or(Error::BadAddress)?;
range.addr = new_mem; Ok(unsafe { MemoryRange::new(new_mem.get(), range.len()).unwrap() })
Ok(range)
} }
pub fn unmap_memory_pre(_range: &MemoryRange) -> core::result::Result<(), Error> { pub fn unmap_memory_pre(_range: &MemoryRange) -> core::result::Result<(), Error> {