From 00b0dc819d1aac88ee45b18fdb05337e01a2df67 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 4 Apr 2022 21:12:03 +0100 Subject: [PATCH] all-stop/synchronous RSP support thread-exit events Currently, GDB does not understand the THREAD_EXITED stop reply in remote all-stop mode. There's no good reason for this, it just happened that THREAD_EXITED was only ever reported in non-stop mode so far. This patch teaches GDB to parse that event in all-stop RSP too. There is no need to add a qSupported feature for this, because the server won't send a THREAD_EXITED event unless GDB explicitly asks for it, with QThreadEvents, or with the GDB_THREAD_OPTION_EXIT QThreadOptions option added in the next patch. Change-Id: Ide5d12391adf432779fe4c79526801c4a5630966 --- gdb/remote.c | 7 ++++++- gdbserver/server.cc | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/remote.c b/gdb/remote.c index 991a4344c7f..eb537fc48a5 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -8415,6 +8415,11 @@ remote_target::process_stop_reply (struct stop_reply *stop_reply, /* Expedited registers. */ if (!stop_reply->regcache.empty ()) { + /* 'w' stop replies don't cary expedited registers (which + wouldn't make any sense for a thread that is gone + already). */ + gdb_assert (status->kind () != TARGET_WAITKIND_THREAD_EXITED); + struct regcache *regcache = get_thread_arch_regcache (this, ptid, stop_reply->arch); @@ -8599,7 +8604,7 @@ remote_target::wait_as (ptid_t ptid, target_waitstatus *status, again. Keep waiting for events. */ rs->waiting_for_stop_reply = 1; break; - case 'N': case 'T': case 'S': case 'X': case 'W': + case 'N': case 'T': case 'S': case 'X': case 'W': case 'w': { /* There is a stop reply to handle. */ rs->waiting_for_stop_reply = 0; diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 2a70ca63cbd..4a312da40bc 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -3045,6 +3045,7 @@ resume (struct thread_resume *actions, size_t num_actions) if (cs.last_status.kind () != TARGET_WAITKIND_EXITED && cs.last_status.kind () != TARGET_WAITKIND_SIGNALLED + && cs.last_status.kind () != TARGET_WAITKIND_THREAD_EXITED && cs.last_status.kind () != TARGET_WAITKIND_NO_RESUMED) current_thread->last_status = cs.last_status; -- 2.30.2