metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

feat: ✨ Print panic message with details

This commit is contained in:
Berkus Decker 2023-07-30 02:39:48 +03:00 committed by Berkus Decker
parent c3f23108b9
commit 4733c012ad
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
machine/src/panic.rs
View File

@ -1,22 +1,38 @@
//! A panic handler for hardware and for QEMU. //! A panic handler for hardware and for QEMU.
use core::panic::PanicInfo; use core::panic::PanicInfo;
fn print_panic_info(info: &PanicInfo) {
let (location, line, column) = match info.location() {
Some(loc) => (loc.file(), loc.line(), loc.column()),
_ => ("???", 0, 0),
};
// @todo This may fail to print if the panic message is too long for local print buffer.
crate::info!(
"Kernel panic!\n\n\
Panic location:\n File '{}', line {}, column {}\n\n\
{}",
location,
line,
column,
info.message().unwrap_or(&format_args!("")),
);
}
pub fn handler(info: &PanicInfo) -> ! { pub fn handler(info: &PanicInfo) -> ! {
// Protect against panic infinite loops if any of the following code panics itself. // Protect against panic infinite loops if any of the following code panics itself.
panic_prevent_reenter(); panic_prevent_reenter();
// @todo This may fail to print if the panic message is too long for local print buffer. print_panic_info(info);
crate::println!("\nPanic: {}\n", info);
crate::endless_sleep() crate::endless_sleep()
} }
/// We have two separate handlers because other crates may use machine crate as a dependency for /// We have two separate handlers because other crates may use machine crate as a dependency for
/// running their tests, and this means machine could be compiled with different features. /// running their tests, and this means machine could be compiled with different features.
pub fn handler_for_tests(info: &core::panic::PanicInfo) -> ! { pub fn handler_for_tests(info: &PanicInfo) -> ! {
crate::println!("\n[failed]\n"); crate::println!("\n[failed]\n");
// Protect against panic infinite loops if any of the following code panics itself. // Protect against panic infinite loops if any of the following code panics itself.
panic_prevent_reenter(); panic_prevent_reenter();
// @todo This may fail to print if the panic message is too long for local print buffer. print_panic_info(info);
crate::println!("\nPanic: {}\n", info);
crate::qemu::semihosting::exit_failure() crate::qemu::semihosting::exit_failure()
} }