http://sourceware.org/ml/gdb-cvs/2013-06/msg00014.html

### src/gdb/gdbserver/ChangeLog	2013/05/31 19:14:33	1.720

### src/gdb/gdbserver/ChangeLog	2013/06/04 12:59:20	1.721

## -1,3 +1,12 @@

+2013-06-04  Gary Benson  <gbenson@redhat.com>

+

+	* server.c (handle_query): Add "augmented-libraries-svr4-read+"

+	to qSupported response when appropriate.

+	(handle_qxfer_libraries_svr4): Allow qXfer:libraries-svr4:read

+	with nonzero-length annex.

+	* linux-low.c (linux_qxfer_libraries_svr4): Parse and handle

+	arguments supplied in annex.

+

 2013-05-31  Doug Evans  <dje@google.com>

 	* linux-x86-low.c (ps_get_thread_area): Properly extend address to

--- src/gdb/gdbserver/linux-low.c	2013/05/23 17:17:50	1.237

+++ src/gdb/gdbserver/linux-low.c	2013/06/04 12:59:21	1.238

@@ -5728,6 +5728,12 @@

     };

   const struct link_map_offsets *lmo;

   unsigned int machine;

+  int ptr_size;

+  CORE_ADDR lm_addr = 0, lm_prev = 0;

+  int allocated = 1024;

+  char *p;

+  CORE_ADDR l_name, l_addr, l_ld, l_next, l_prev;

+  int header_done = 0;

   if (writebuf != NULL)

     return -2;

@@ -5738,128 +5744,144 @@

   xsnprintf (filename, sizeof filename, "/proc/%d/exe", pid);

   is_elf64 = elf_64_file_p (filename, &machine);

   lmo = is_elf64 ? &lmo_64bit_offsets : &lmo_32bit_offsets;

+  ptr_size = is_elf64 ? 8 : 4;

-  if (priv->r_debug == 0)

-    priv->r_debug = get_r_debug (pid, is_elf64);

-

-  /* We failed to find DT_DEBUG.  Such situation will not change for this

-     inferior - do not retry it.  Report it to GDB as E01, see for the reasons

-     at the GDB solib-svr4.c side.  */

-  if (priv->r_debug == (CORE_ADDR) -1)

-    return -1;

-

-  if (priv->r_debug == 0)

+  while (annex[0] != '\0')

     {

-      document = xstrdup ("<library-list-svr4 version=\"1.0\"/>\n");

+      const char *sep;

+      CORE_ADDR *addrp;

+      int len;

+

+      sep = strchr (annex, '=');

+      if (sep == NULL)

+	break;

+

+      len = sep - annex;

+      if (len == 5 && strncmp (annex, "start", 5) == 0)

+	addrp = &lm_addr;

+      else if (len == 4 && strncmp (annex, "prev", 4) == 0)

+	addrp = &lm_prev;

+      else

+	{

+	  annex = strchr (sep, ';');

+	  if (annex == NULL)

+	    break;

+	  annex++;

+	  continue;

+	}

+

+      annex = decode_address_to_semicolon (addrp, sep + 1);

     }

-  else

+

+  if (lm_addr == 0)

     {

-      int allocated = 1024;

-      char *p;

-      const int ptr_size = is_elf64 ? 8 : 4;

-      CORE_ADDR lm_addr, lm_prev, l_name, l_addr, l_ld, l_next, l_prev;

-      int r_version, header_done = 0;

-

-      document = xmalloc (allocated);

-      strcpy (document, "

-      p = document + strlen (document);

-

-      r_version = 0;

-      if (linux_read_memory (priv->r_debug + lmo->r_version_offset,

-			     (unsigned char *) &r_version,

-			     sizeof (r_version)) != 0

-	  || r_version != 1)

+      int r_version = 0;

+

+      if (priv->r_debug == 0)

+	priv->r_debug = get_r_debug (pid, is_elf64);

+

+      /* We failed to find DT_DEBUG.  Such situation will not change

+	 for this inferior - do not retry it.  Report it to GDB as

+	 E01, see for the reasons at the GDB solib-svr4.c side.  */

+      if (priv->r_debug == (CORE_ADDR) -1)

+	return -1;

+

+      if (priv->r_debug != 0)

 	{

-	  warning ("unexpected r_debug version %d", r_version);

-	  goto done;

+	  if (linux_read_memory (priv->r_debug + lmo->r_version_offset,

+				 (unsigned char *) &r_version,

+				 sizeof (r_version)) != 0

+	      || r_version != 1)

+	    {

+	      warning ("unexpected r_debug version %d", r_version);

+	    }

+	  else if (read_one_ptr (priv->r_debug + lmo->r_map_offset,

+				 &lm_addr, ptr_size) != 0)

+	    {

+	      warning ("unable to read r_map from 0x%lx",

+		       (long) priv->r_debug + lmo->r_map_offset);

+	    }

 	}

+    }

+

+  document = xmalloc (allocated);

+  strcpy (document, "

+  p = document + strlen (document);

+

+  while (lm_addr

+	 && read_one_ptr (lm_addr + lmo->l_name_offset,

+			  &l_name, ptr_size) == 0

+	 && read_one_ptr (lm_addr + lmo->l_addr_offset,

+			  &l_addr, ptr_size) == 0

+	 && read_one_ptr (lm_addr + lmo->l_ld_offset,

+			  &l_ld, ptr_size) == 0

+	 && read_one_ptr (lm_addr + lmo->l_prev_offset,

+			  &l_prev, ptr_size) == 0

+	 && read_one_ptr (lm_addr + lmo->l_next_offset,

+			  &l_next, ptr_size) == 0)

+    {

+      unsigned char libname[PATH_MAX];

-      if (read_one_ptr (priv->r_debug + lmo->r_map_offset,

-			&lm_addr, ptr_size) != 0)

+      if (lm_prev != l_prev)

 	{

-	  warning ("unable to read r_map from 0x%lx",

-		   (long) priv->r_debug + lmo->r_map_offset);

-	  goto done;

+	  warning ("Corrupted shared library list: 0x%lx != 0x%lx",

+		   (long) lm_prev, (long) l_prev);

+	  break;

 	}

-      lm_prev = 0;

-      while (read_one_ptr (lm_addr + lmo->l_name_offset,

-			   &l_name, ptr_size) == 0

-	     && read_one_ptr (lm_addr + lmo->l_addr_offset,

-			      &l_addr, ptr_size) == 0

-	     && read_one_ptr (lm_addr + lmo->l_ld_offset,

-			      &l_ld, ptr_size) == 0

-	     && read_one_ptr (lm_addr + lmo->l_prev_offset,

-			      &l_prev, ptr_size) == 0

-	     && read_one_ptr (lm_addr + lmo->l_next_offset,

-			      &l_next, ptr_size) == 0)

+      /* Not checking for error because reading may stop before

+	 we've got PATH_MAX worth of characters.  */

+      libname[0] = '\0';

+      linux_read_memory (l_name, libname, sizeof (libname) - 1);

+      libname[sizeof (libname) - 1] = '\0';

+      if (libname[0] != '\0')

 	{

-	  unsigned char libname[PATH_MAX];

+	  /* 6x the size for xml_escape_text below.  */

+	  size_t len = 6 * strlen ((char *) libname);

+	  char *name;

-	  if (lm_prev != l_prev)

+	  if (!header_done)

 	    {

-	      warning ("Corrupted shared library list: 0x%lx != 0x%lx",

-		       (long) lm_prev, (long) l_prev);

-	      break;

+	      /* Terminate `

+	      *p++ = '>';

+	      header_done = 1;

 	    }

-	  /* Not checking for error because reading may stop before

-	     we've got PATH_MAX worth of characters.  */

-	  libname[0] = '\0';

-	  linux_read_memory (l_name, libname, sizeof (libname) - 1);

-	  libname[sizeof (libname) - 1] = '\0';

-	  if (libname[0] != '\0')

+	  while (allocated < p - document + len + 200)

 	    {

-	      /* 6x the size for xml_escape_text below.  */

-	      size_t len = 6 * strlen ((char *) libname);

-	      char *name;

-

-	      if (!header_done)

-		{

-		  /* Terminate `

-		  *p++ = '>';

-		  header_done = 1;

-		}

-

-	      while (allocated < p - document + len + 200)

-		{

-		  /* Expand to guarantee sufficient storage.  */

-		  uintptr_t document_len = p - document;

-

-		  document = xrealloc (document, 2 * allocated);

-		  allocated *= 2;

-		  p = document + document_len;

-		}

-

-	      name = xml_escape_text ((char *) libname);

-	      p += sprintf (p, "

-			       "l_addr=\"0x%lx\" l_ld=\"0x%lx\"/>",

-			    name, (unsigned long) lm_addr,

-			    (unsigned long) l_addr, (unsigned long) l_ld);

-	      free (name);

-	    }

-	  else if (lm_prev == 0)

-	    {

-	      sprintf (p, " main-lm=\"0x%lx\"", (unsigned long) lm_addr);

-	      p = p + strlen (p);

-	    }

+	      /* Expand to guarantee sufficient storage.  */

+	      uintptr_t document_len = p - document;

-	  if (l_next == 0)

-	    break;

+	      document = xrealloc (document, 2 * allocated);

+	      allocated *= 2;

+	      p = document + document_len;

+	    }

-	  lm_prev = lm_addr;

-	  lm_addr = l_next;

+	  name = xml_escape_text ((char *) libname);

+	  p += sprintf (p, "

+			"l_addr=\"0x%lx\" l_ld=\"0x%lx\"/>",

+			name, (unsigned long) lm_addr,

+			(unsigned long) l_addr, (unsigned long) l_ld);

+	  free (name);

 	}

-    done:

-      if (!header_done)

+      else if (lm_prev == 0)

 	{

-	  /* Empty list; terminate `

-	  strcpy (p, "/>");

+	  sprintf (p, " main-lm=\"0x%lx\"", (unsigned long) lm_addr);

+	  p = p + strlen (p);

 	}

-      else

-	strcpy (p, "</library-list-svr4>");

+

+      lm_prev = lm_addr;

+      lm_addr = l_next;

     }

+  if (!header_done)

+    {

+      /* Empty list; terminate `

+      strcpy (p, "/>");

+    }

+  else

+    strcpy (p, "</library-list-svr4>");

+

   document_len = strlen (document);

   if (offset < document_len)

     document_len -= offset;

--- src/gdb/gdbserver/server.c	2013/05/24 11:28:06	1.191

+++ src/gdb/gdbserver/server.c	2013/06/04 12:59:21	1.192

@@ -1115,8 +1115,7 @@

   if (writebuf != NULL)

     return -2;

-  if (annex[0] != '\0' || !target_running ()

-      || the_target->qxfer_libraries_svr4 == NULL)

+  if (!target_running () || the_target->qxfer_libraries_svr4 == NULL)

     return -1;

   return the_target->qxfer_libraries_svr4 (annex, readbuf, writebuf, offset, len);

@@ -1743,7 +1742,8 @@

 	       PBUFSIZ - 1);

       if (the_target->qxfer_libraries_svr4 != NULL)

-	strcat (own_buf, ";qXfer:libraries-svr4:read+");

+	strcat (own_buf, ";qXfer:libraries-svr4:read+"

+		";augmented-libraries-svr4-read+");

       else

 	{

 	  /* We do not have any hook to indicate whether the non-SVR4 target