Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

panic_handler: update msg format and add column location

Browse source
This commit is contained in:
Spxg 2021-03-07 11:58:14 +08:00
parent e214d0f91b
commit ac43589e9d
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
os/src/lang_items.rs
View file

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