Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-23 09:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve exception handling panic message

Browse Source
This commit is contained in:
Zhang Junyang
2025-06-13 10:05:16 +08:00
committed by Tate, Hongliang Tian
parent c2a49bca7c
commit 86a7aa09eb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/src/arch/x86/signal.rs
View File

@ -16,7 +16,10 @@ impl SignalContext for UserContext {
impl From<&CpuExceptionInfo> for FaultSignal { impl From<&CpuExceptionInfo> for FaultSignal {
fn from(trap_info: &CpuExceptionInfo) -> Self { fn from(trap_info: &CpuExceptionInfo) -> Self {
let exception = CpuException::to_cpu_exception(trap_info.id as u16).unwrap(); let Some(exception) = CpuException::to_cpu_exception(trap_info.id as u16) else {
panic!("Unknown CPU exception ID in {trap_info:?}");
};
let (num, code, addr) = match exception { let (num, code, addr) = match exception {
CpuException::DIVIDE_BY_ZERO => (SIGFPE, FPE_INTDIV, None), CpuException::DIVIDE_BY_ZERO => (SIGFPE, FPE_INTDIV, None),
CpuException::X87_FLOATING_POINT_EXCEPTION CpuException::X87_FLOATING_POINT_EXCEPTION
@ -35,8 +38,9 @@ impl From<&CpuExceptionInfo> for FaultSignal {
let addr = Some(trap_info.page_fault_addr as u64); let addr = Some(trap_info.page_fault_addr as u64);
(SIGSEGV, code, addr) (SIGSEGV, code, addr)
} }
_ => panic!("Exception cannot be a signal"), e => panic!("{e:?} cannot be handled via signals ({trap_info:?})"),
}; };
FaultSignal::new(num, code, addr) FaultSignal::new(num, code, addr)
} }
} }