mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
add option to print panics to screen on certain kernel panic events
This commit is contained in:
parent
344dd5094b
commit
b471b604d0
1 changed files with 17 additions and 1 deletions
|
|
@ -156,6 +156,7 @@ fn generate_exception_args(ex: &RiscvException) -> Option<[usize; 3]> {
|
||||||
/// the Interrupt or Exception enum and passed to handle_interrupt or
|
/// the Interrupt or Exception enum and passed to handle_interrupt or
|
||||||
/// handle_exception.
|
/// handle_exception.
|
||||||
#[export_name = "_start_trap_rust"]
|
#[export_name = "_start_trap_rust"]
|
||||||
|
#[allow(unreachable_code)] // panic handler will terminate execution
|
||||||
pub extern "C" fn trap_handler(
|
pub extern "C" fn trap_handler(
|
||||||
a0: usize,
|
a0: usize,
|
||||||
a1: usize,
|
a1: usize,
|
||||||
|
|
@ -355,7 +356,10 @@ pub extern "C" fn trap_handler(
|
||||||
}
|
}
|
||||||
|
|
||||||
_ => {
|
_ => {
|
||||||
|
#[cfg(not(any(feature = "precursor", feature = "renode")))]
|
||||||
println!("!!! Unrecognized exception: {:?}", ex);
|
println!("!!! Unrecognized exception: {:?}", ex);
|
||||||
|
#[cfg(any(feature = "precursor", feature = "renode"))]
|
||||||
|
panic!("!!! Unrecognized exception: {:?}", ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -393,8 +397,9 @@ pub extern "C" fn trap_handler(
|
||||||
let is_kernel_failure = sstatus::read().spp() == sstatus::SPP::Supervisor;
|
let is_kernel_failure = sstatus::read().spp() == sstatus::SPP::Supervisor;
|
||||||
// The exception was not handled. We should terminate the program here.
|
// The exception was not handled. We should terminate the program here.
|
||||||
// For now, let's halt the whole system instead so that it becomes
|
// For now, let's halt the whole system instead so that it becomes
|
||||||
// immediately obvious that we screwed up. On harware this will trigger
|
// immediately obvious that we screwed up. On hardware this will trigger
|
||||||
// a watchdog reset.
|
// a watchdog reset.
|
||||||
|
#[cfg(not(any(feature = "precursor", feature = "renode")))]
|
||||||
println!(
|
println!(
|
||||||
"{}: CPU Exception on PID {}: {}",
|
"{}: CPU Exception on PID {}: {}",
|
||||||
if is_kernel_failure {
|
if is_kernel_failure {
|
||||||
|
|
@ -405,6 +410,17 @@ pub extern "C" fn trap_handler(
|
||||||
pid,
|
pid,
|
||||||
ex
|
ex
|
||||||
);
|
);
|
||||||
|
#[cfg(any(feature = "precursor", feature = "renode"))]
|
||||||
|
panic!(
|
||||||
|
"{}: CPU Exception on PID {}: {}",
|
||||||
|
if is_kernel_failure {
|
||||||
|
"!!! KERNEL FAILURE !!!"
|
||||||
|
} else {
|
||||||
|
"PROGRAM HALT"
|
||||||
|
},
|
||||||
|
pid,
|
||||||
|
ex
|
||||||
|
);
|
||||||
ArchProcess::with_current(|process| {
|
ArchProcess::with_current(|process| {
|
||||||
println!("Current thread {}:", process.current_tid());
|
println!("Current thread {}:", process.current_tid());
|
||||||
process.print_current_thread();
|
process.print_current_thread();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue