Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-10 05:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable interrupts when go back with UserEvent::Expcetion

Browse Source
This commit is contained in:
Yuke Peng 2023-04-03 07:01:00 -07:00 committed by Tate, Hongliang Tian
parent 9cad3d7252
commit 207bc1e4c2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/jinux-frame/src/arch/x86/cpu.rs
View File

@ -98,6 +98,7 @@ impl UserContextApiInternal for UserContext {
call_irq_callback_functions(&self.into_trap_frame()); call_irq_callback_functions(&self.into_trap_frame());
} }
crate::arch::irq::enable_interrupts();
if self.user_context.trap_num as u16 != SYSCALL_TRAPNUM { if self.user_context.trap_num as u16 != SYSCALL_TRAPNUM {
self.trap_information = TrapInformation { self.trap_information = TrapInformation {
cr2: unsafe { x86::controlregs::cr2() }, cr2: unsafe { x86::controlregs::cr2() },
@ -106,7 +107,6 @@ impl UserContextApiInternal for UserContext {
}; };
UserEvent::Exception UserEvent::Exception
} else { } else {
crate::arch::irq::enable_interrupts();
UserEvent::Syscall UserEvent::Syscall
} }
} }

2
src/services/libs/jinux-std/src/process/signal/mod.rs
View File

@ -131,7 +131,7 @@ pub fn handle_user_signal(
// Set up signal stack in user stack, // Set up signal stack in user stack,
// to avoid corrupting user stack, we minus 128 first. // to avoid corrupting user stack, we minus 128 first.
let mut user_rsp = context.gp_regs.rsp() as u64; let mut user_rsp = context.rsp() as u64;
user_rsp = user_rsp - 128; user_rsp = user_rsp - 128;
// 1. write siginfo_t // 1. write siginfo_t