From 02065a6a0b00bf9084337963ed47164e5df8269c Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 28 Feb 2023 09:39:18 +0800 Subject: [PATCH] kernel: make `disable_irq()` infallible This function never failed. Make it infallible so that it matches the same calling convention as `enable_irq()` Signed-off-by: Sean Cross --- kernel/src/arch/hosted/irq.rs | 2 +- kernel/src/arch/riscv/irq.rs | 10 ++++++++-- kernel/src/irq.rs | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/kernel/src/arch/hosted/irq.rs b/kernel/src/arch/hosted/irq.rs index 7b5c3060a..4c4911c5b 100644 --- a/kernel/src/arch/hosted/irq.rs +++ b/kernel/src/arch/hosted/irq.rs @@ -7,7 +7,7 @@ pub fn enable_irq(_irq_no: usize) { unimplemented!() } -pub fn disable_irq(_irq_no: usize) -> Result<(), xous_kernel::Error> { +pub fn disable_irq(_irq_no: usize) { unimplemented!() } diff --git a/kernel/src/arch/riscv/irq.rs b/kernel/src/arch/riscv/irq.rs index 20611d955..bf976124d 100644 --- a/kernel/src/arch/riscv/irq.rs +++ b/kernel/src/arch/riscv/irq.rs @@ -34,9 +34,8 @@ pub fn enable_irq(irq_no: usize) { sim::write(sim::read() | (1 << irq_no)); } -pub fn disable_irq(irq_no: usize) -> Result<(), xous_kernel::Error> { +pub fn disable_irq(irq_no: usize) { sim::write(sim::read() & !(1 << irq_no)); - Ok(()) } static mut PREVIOUS_PAIR: Option<(PID, TID)> = None; @@ -331,6 +330,13 @@ pub extern "C" fn trap_handler( // If it's not a failure in the kernel, terminate or debug the current process. SystemServices::with_mut(|ss| { + #[cfg(feature = "gdb-stub")] + { + ss.suspend_process(pid) + .expect("couldn't debug current process"); + println!("Program suspended. You may inspect it using gdb."); + } + #[cfg(not(feature = "gdb-stub"))] ss.terminate_process(pid) .expect("couldn't terminate current process"); crate::syscall::reset_switchto_caller(); diff --git a/kernel/src/irq.rs b/kernel/src/irq.rs index 5df96608e..0c000b1c6 100644 --- a/kernel/src/irq.rs +++ b/kernel/src/irq.rs @@ -37,7 +37,7 @@ pub fn handle(irqs_pending: usize) -> Result Result<(), xous_kernel::Error> { } else if !IRQ_HANDLERS[irq].map(|f| f.0 == pid).unwrap_or(false) { Err(xous_kernel::Error::InterruptNotFound) } else { - arch::irq::disable_irq(irq).unwrap(); + arch::irq::disable_irq(irq); IRQ_HANDLERS[irq] = None; Ok(()) } @@ -104,7 +104,7 @@ pub fn release_interrupts_for_pid(pid: PID) { for (irq, handler) in IRQ_HANDLERS.iter_mut().enumerate() { if let Some(h) = handler { if h.0 == pid { - arch::irq::disable_irq(irq).unwrap(); + arch::irq::disable_irq(irq); *handler = None; } }