saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

commit that captures the multiple lend bug

Browse source
This commit is contained in:
bunnie 2021-02-16 12:42:11 +08:00
parent 2b003f8a7d
commit b803d7d4e9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/src/arch/riscv/mem.rs
View file

@ -474,6 +474,7 @@ pub fn lend_page_inner(
dest_addr: *mut u8,
mutable: bool,
) -> Result<usize, xous_kernel::Error> {
klog!("***lend - src: {:08x} dest: {:08x}***", src_addr as u32, dest_addr as u32);
let entry = pagetable_entry(src_addr as usize)?;
let phys = (*entry >> 10) << 12;
@ -542,6 +543,7 @@ pub fn return_page_inner(
dest_space: &MemoryMapping,
dest_addr: *mut u8,
) -> Result<usize, xous_kernel::Error> {
klog!("***return - src: {:08x} dest: {:08x}***", src_addr as u32, dest_addr as u32);
let src_entry = pagetable_entry(src_addr as usize)?;
let phys = (*src_entry >> 10) << 12;

4
services/log-server/src/main.rs
View file

@ -258,7 +258,7 @@ fn reader_thread(mut output: implementation::OutputWriter) {
.unwrap();
}
xous::Message::Move(msg) => {
String<4000>::from_message(msg)
String::<4000>::from_message(msg)
.map(|log_entry: String<4000>| {
writeln!(
output,
@ -285,7 +285,7 @@ fn reader_thread(mut output: implementation::OutputWriter) {
.ok();
}
xous::Message::MutableBorrow(msg) => {
String<4000>::from_message(msg)
String::<4000>::from_message(msg)
.map(|mut log_entry: String<4000>| {
writeln!(
output,