saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle both cases in the irq return handler

Browse source 
differentiate between the case that we got here via
a page fault, or a syscall, and handle appropriately
This commit is contained in:
bunnie 2024-04-01 14:08:15 +08:00
parent 2f23225b9d
commit ec439a38d4
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kernel/src/arch/riscv/irq.rs
View file

@ -320,7 +320,7 @@ pub extern "C" fn trap_handler(
);
}
// Cleanup after the swapper
let _response = Swap::with_mut(|s|
let response = Swap::with_mut(|s|
// safety: this is safe because on return from swapper, we're in the swapper's memory space.
unsafe { s.exit_blocking_call() })
.unwrap_or_else(xous_kernel::Result::Error);
@ -345,9 +345,17 @@ pub extern "C" fn trap_handler(
// Re-enable interrupts now that we're out of the swap context
enable_all_irqs();
ArchProcess::with_current_mut(|process| {
crate::arch::syscall::resume(current_pid().get() == 1, process.current_thread())
});
if response == xous_kernel::Result::ResumeProcess {
ArchProcess::with_current_mut(|process| {
crate::arch::syscall::resume(current_pid().get() == 1, process.current_thread())
});
} else {
ArchProcess::with_current_mut(|p| {
let thread = p.current_thread();
println!("Returning to address {:08x}", thread.sepc);
unsafe { _xous_syscall_return_result(&response, thread) };
});
}
}
#[cfg(feature = "gdb-stub")]