kernel: gdb: unpause process on disconnect

Resume the debugged process when the debugger disconnects.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2023-04-06 14:34:13 +08:00
parent 916a0bde42
commit 6016f951ef

View file

@ -37,12 +37,16 @@ static mut GDB_BUFFER: [u8; 4096] = [0u8; 4096];
trait ProcessPid { trait ProcessPid {
fn pid(&self) -> Option<xous_kernel::PID>; fn pid(&self) -> Option<xous_kernel::PID>;
fn take_pid(&mut self) -> Option<xous_kernel::PID>;
} }
impl ProcessPid for XousTarget { impl ProcessPid for XousTarget {
fn pid(&self) -> Option<xous_kernel::PID> { fn pid(&self) -> Option<xous_kernel::PID> {
self.pid self.pid
} }
fn take_pid(&mut self) -> Option<xous_kernel::PID> {
self.pid.take()
}
} }
fn receive_irq(uart: &mut GdbUart) { fn receive_irq(uart: &mut GdbUart) {
@ -94,8 +98,6 @@ fn ensure_can_accept_characters_inner<'a, T: Target + ProcessPid, C: Connection>
println!("Unable to pause process {:?} for debug: {:?}", pid, e); println!("Unable to pause process {:?} for debug: {:?}", pid, e);
} }
}); });
} else {
println!("No process specified! Not debugging");
} }
let Ok(new_server) = gdb_stm_inner.interrupt_handled(target, Some(MultiThreadStopReason::Signal(Signal::SIGINT))) else { let Ok(new_server) = gdb_stm_inner.interrupt_handled(target, Some(MultiThreadStopReason::Signal(Signal::SIGINT))) else {
@ -104,10 +106,12 @@ fn ensure_can_accept_characters_inner<'a, T: Target + ProcessPid, C: Connection>
ensure_can_accept_characters_inner(new_server, target, recurse_count - 1) ensure_can_accept_characters_inner(new_server, target, recurse_count - 1)
} }
GdbStubStateMachine::Disconnected(gdb_stm_inner) => { GdbStubStateMachine::Disconnected(gdb_stm_inner) => {
println!( if let Some(pid) = target.take_pid() {
"GdbStubStateMachine::Disconnected due to {:?}", crate::services::SystemServices::with_mut(|system_services| {
gdb_stm_inner.get_reason() system_services.resume_process_from_debug(pid).unwrap()
); });
}
ensure_can_accept_characters_inner( ensure_can_accept_characters_inner(
gdb_stm_inner.return_to_idle(), gdb_stm_inner.return_to_idle(),
target, target,