mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
kernel: riscv: don't print valid page faults
Some page faults are valid, and shouldn't be printed unless they fail. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
8d99ee06cf
commit
6cf140f2da
1 changed files with 13 additions and 1 deletions
|
|
@ -121,7 +121,7 @@ pub extern "C" fn trap_handler(
|
||||||
// it with one if necessary.
|
// it with one if necessary.
|
||||||
match ex {
|
match ex {
|
||||||
RiscvException::StorePageFault(pc, addr) | RiscvException::LoadPageFault(pc, addr) => {
|
RiscvException::StorePageFault(pc, addr) | RiscvException::LoadPageFault(pc, addr) => {
|
||||||
#[cfg(any(feature = "debug-print", feature = "print-panics"))]
|
#[cfg(all(feature = "debug-print", feature = "print-panics"))]
|
||||||
print!(
|
print!(
|
||||||
"KERNEL({}): RISC-V fault: {} @ {:08x}, addr {:08x} - ",
|
"KERNEL({}): RISC-V fault: {} @ {:08x}, addr {:08x} - ",
|
||||||
pid, ex, pc, addr
|
pid, ex, pc, addr
|
||||||
|
|
@ -130,6 +130,11 @@ pub extern "C" fn trap_handler(
|
||||||
let entry = crate::arch::mem::pagetable_entry(virt).unwrap_or_else(|x| {
|
let entry = crate::arch::mem::pagetable_entry(virt).unwrap_or_else(|x| {
|
||||||
// MemoryManagerHandle::get().print_ownership();
|
// MemoryManagerHandle::get().print_ownership();
|
||||||
MemoryMapping::current().print_map();
|
MemoryMapping::current().print_map();
|
||||||
|
#[cfg(not(any(feature = "debug-print", feature = "print-panics")))]
|
||||||
|
print!(
|
||||||
|
"KERNEL({}): RISC-V fault: {} @ {:08x}, addr {:08x} - ",
|
||||||
|
pid, ex, pc, addr
|
||||||
|
);
|
||||||
panic!(
|
panic!(
|
||||||
"error {:?} at {:08x}: memory not mapped or reserved for addr {:08x}",
|
"error {:?} at {:08x}: memory not mapped or reserved for addr {:08x}",
|
||||||
x, pc, addr
|
x, pc, addr
|
||||||
|
|
@ -164,6 +169,7 @@ pub extern "C" fn trap_handler(
|
||||||
flush_mmu();
|
flush_mmu();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[cfg(all(feature = "debug-print", feature = "print-panics"))]
|
||||||
println!("Handing page {:08x} to process", new_page);
|
println!("Handing page {:08x} to process", new_page);
|
||||||
ArchProcess::with_current_mut(|process| {
|
ArchProcess::with_current_mut(|process| {
|
||||||
crate::arch::syscall::resume(
|
crate::arch::syscall::resume(
|
||||||
|
|
@ -171,6 +177,12 @@ pub extern "C" fn trap_handler(
|
||||||
process.current_thread(),
|
process.current_thread(),
|
||||||
)
|
)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
#[cfg(all(not(feature = "debug-print"), feature = "print-panics"))]
|
||||||
|
print!(
|
||||||
|
"KERNEL({}): RISC-V fault: {} @ {:08x}, addr {:08x} - ",
|
||||||
|
pid, ex, pc, addr
|
||||||
|
);
|
||||||
}
|
}
|
||||||
println!("Page was not allocated");
|
println!("Page was not allocated");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue