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

Merge pull request #9 from Spxg/main

Browse source 
panic_handler: update msg format and add column location
This commit is contained in:
Yifan Wu 2021-03-07 12:06:28 +08:00 • committed by GitHub
commit 568c48cd7d
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]
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()
}