Merge pull request #9 from Spxg/main

panic_handler: update msg format and add column location
pull/12/head
Yifan Wu 4 years ago committed by GitHub
commit 60477da9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3,10 +3,16 @@ use crate::sbi::shutdown;
#[panic_handler]
fn panic(info: &PanicInfo) -> ! {
if let Some(location) = info.location() {
println!("[kernel] Panicked at {}:{} {}", location.file(), location.line(), info.message().unwrap());
} else {
println!("[kernel] Panicked: {}", info.message().unwrap());
match info.location() {
Some(location) => {
println!("[kernel] panicked at '{}', {}:{}:{}",
info.message().unwrap(),
location.file(),
location.line(),
location.column()
);
}
None => println!("[kernel] panicked at '{}'", info.message().unwrap())
}
shutdown()
}

Loading…
Cancel
Save