[PATCH v3 17/44] gdb, gdbserver, ze: add library notification to U stop reply

[Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>]

From: Markus Metzger <markus.t.metzger@intel.com>

If libraries have changed, add a ";library" notification to a 'U' stop
reply packet and handle it at the GDB side.

Reviewed-By: Eli Zaretskii <eliz@gnu.org>
---
 gdb/doc/gdb.texinfo       |  5 +++++
 gdb/remote.c              | 11 +++++++++--
 gdbserver/remote-utils.cc | 22 +++++++++++++++++++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 634675242bd4ff72b6742597133e7ad28d6768da..de9c49d3f9193f768e899ea22eb4b10cf78ea337 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -44154,10 +44154,15 @@ or @samp{s} action is expected to be continued.  @xref{File-I/O Remote
 Protocol Extension}, for more details.
 
 @item U @var{thread-id}
+@itemx U @var{thread-id};library
 The program is currently unavailable.  The remote target tried to stop
 it but it would not respond.  The thread designator @var{thread-id}
 has the format and interpretation described in @ref{thread-id syntax}.
 
+If @samp{;library} is appended, the loaded libraries have changed.
+@value{GDBN} should use @samp{qXfer:libraries:read} to fetch a new
+list of loaded libraries.
+
 This packet should not be sent by default; older @value{GDBN} versions
 did not support it.  @value{GDBN} requests it, by supplying an
 appropriate @samp{qSupported} feature (@pxref{qSupported}).  The
diff --git a/gdb/remote.c b/gdb/remote.c
index 461bbfb783019e433a3a0378b3162444edc30dce..385618fcbd91dcfab2fd55b534eec303c689cfed 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -8387,8 +8387,15 @@ Packet: '%s'\n"),
       event->ptid = minus_one_ptid;
       break;
     case 'U':
-      event->ws.set_unavailable ();
-      event->ptid = read_ptid (&buf[1], NULL);
+      {
+	const char *opt = nullptr;
+
+	event->ws.set_unavailable ();
+	event->ptid = read_ptid (&buf[1], &opt);
+
+	if (strcmp (opt, ";library") == 0)
+	  event->ws.set_loaded ();
+      }
       break;
     }
 }
diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc
index 6b4d15763afc8c31ecf05b902319b0a2c1427aa3..56fb9c86742c160318502eab4d43ca829d5c593a 100644
--- a/gdbserver/remote-utils.cc
+++ b/gdbserver/remote-utils.cc
@@ -1288,9 +1288,25 @@ prepare_resume_reply (char *buf, ptid_t ptid, const target_waitstatus &status)
       sprintf (buf, "N");
       break;
     case TARGET_WAITKIND_UNAVAILABLE:
-      sprintf (buf, "U");
-      buf += strlen (buf);
-      buf = write_ptid (buf, ptid);
+      {
+	sprintf (buf, "U");
+	buf += strlen (buf);
+	buf = write_ptid (buf, ptid);
+
+	process_info *proc = find_process_pid (ptid.pid ());
+	gdb_assert (proc != nullptr);
+	if (proc->dlls_changed)
+	  {
+	    strcpy (buf, ";library");
+	    buf += strlen (buf);
+	    proc->dlls_changed = false;
+	  }
+
+	/* In non-stop, don't change the general thread behind
+	   GDB's back.  */
+	if (!non_stop)
+	  cs.general_thread = ptid;
+      }
       break;
     default:
       error ("unhandled waitkind");

-- 
2.34.1

Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Sean Fennelly, Jeffrey Schneiderman, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928