Share code on to_xfer_partial for tfile and ctf target

In the to_xfer_partial implementations of ctf and tfile, the code on
reading from read-only sections is duplicated.  This patch moves it to
a separate function exec_read_partial_read_only.

gdb:

2014-02-23  Yao Qi  <yao@codesourcery.com>

	* ctf.c (ctf_xfer_partial): Move code to ...
	* exec.c (exec_read_partial_read_only): ... it.  New function.
	* tracefile-tfile.c (tfile_xfer_partial): Likewise.
	* tracefile.c: Include "exec.h".
	* exec.h (exec_read_partial_read_only): Declare.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7c33108d79ac06edc6f87a29696f987472d78d3..11b70b817d5d81acec32e1398af195cf062606d1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-23  Yao Qi  <yao@codesourcery.com>
+
+       * ctf.c (ctf_xfer_partial): Move code to ...
+       * exec.c (exec_read_partial_read_only): ... it.  New function.
+       * tracefile-tfile.c (tfile_xfer_partial): Likewise.
+       * tracefile.c: Include "exec.h".
+       * exec.h (exec_read_partial_read_only): Declare.
+
 2014-02-23  Yao Qi  <yao@codesourcery.com>
 
        * tracefile-tfile.c (tfile_has_all_memory): Remove.

diff --git a/gdb/ctf.c b/gdb/ctf.c
index 6924fb07f59e9602bfe8cff8db6228c3d7feb834..9c8f4d73ccd7b7a5daa0172dd5a0af05a07b4740 100644 (file)
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -1467,47 +1467,7 @@ ctf_xfer_partial (struct target_ops *ops, enum target_object object,
       bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
     }
 
-  /* It's unduly pedantic to refuse to look at the executable for
-     read-only pieces; so do the equivalent of readonly regions aka
-     QTro packet.  */
-  if (exec_bfd != NULL)
-    {
-      asection *s;
-      bfd_size_type size;
-      bfd_vma vma;
-
-      for (s = exec_bfd->sections; s; s = s->next)
-       {
-         if ((s->flags & SEC_LOAD) == 0
-             || (s->flags & SEC_READONLY) == 0)
-           continue;
-
-         vma = s->vma;
-         size = bfd_get_section_size (s);
-         if (vma <= offset && offset < (vma + size))
-           {
-             ULONGEST amt;
-
-             amt = (vma + size) - offset;
-             if (amt > len)
-               amt = len;
-
-             amt = bfd_get_section_contents (exec_bfd, s,
-                                             readbuf, offset - vma, amt);
-
-             if (amt == 0)
-               return TARGET_XFER_EOF;
-             else
-               {
-                 *xfered_len = amt;
-                 return TARGET_XFER_OK;
-               }
-           }
-       }
-    }
-
-  /* Indicate failure to find the requested memory block.  */
-  return TARGET_XFER_E_IO;
+  return exec_read_partial_read_only (readbuf, offset, len, xfered_len);
 }
 
 /* This is the implementation of target_ops method

diff --git a/gdb/exec.c b/gdb/exec.c
index 7f53a5077699c0c4601ec63a07005979c587524c..74c61eb8105be8295da3813dd0e5897072fb0d04 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -530,6 +530,53 @@ remove_target_sections (void *owner)
 
 \f
 
+enum target_xfer_status
+exec_read_partial_read_only (gdb_byte *readbuf, ULONGEST offset,
+                            ULONGEST len, ULONGEST *xfered_len)
+{
+  /* It's unduly pedantic to refuse to look at the executable for
+     read-only pieces; so do the equivalent of readonly regions aka
+     QTro packet.  */
+  if (exec_bfd != NULL)
+    {
+      asection *s;
+      bfd_size_type size;
+      bfd_vma vma;
+
+      for (s = exec_bfd->sections; s; s = s->next)
+       {
+         if ((s->flags & SEC_LOAD) == 0
+             || (s->flags & SEC_READONLY) == 0)
+           continue;
+
+         vma = s->vma;
+         size = bfd_get_section_size (s);
+         if (vma <= offset && offset < (vma + size))
+           {
+             ULONGEST amt;
+
+             amt = (vma + size) - offset;
+             if (amt > len)
+               amt = len;
+
+             amt = bfd_get_section_contents (exec_bfd, s,
+                                             readbuf, offset - vma, amt);
+
+             if (amt == 0)
+               return TARGET_XFER_EOF;
+             else
+               {
+                 *xfered_len = amt;
+                 return TARGET_XFER_OK;
+               }
+           }
+       }
+    }
+
+  /* Indicate failure to find the requested memory block.  */
+  return TARGET_XFER_E_IO;
+}
+
 VEC(mem_range_s) *
 section_table_available_memory (VEC(mem_range_s) *memory,
                                CORE_ADDR memaddr, ULONGEST len,

diff --git a/gdb/exec.h b/gdb/exec.h
index 4725f1ba81f3793c7ee16783a00b038a6968c106..960c58563e552edc4cac16af49d705418c53a9ea 100644 (file)
--- a/gdb/exec.h
+++ b/gdb/exec.h
@@ -46,6 +46,15 @@ extern int build_section_table (struct bfd *, struct target_section **,
 
 extern int resize_section_table (struct target_section_table *, int);
 
+/* Read from mappable read-only sections of BFD executable files.
+   Return TARGET_XFER_OK, if read is successful.  Return
+   TARGET_XFER_EOF if read is done.  Return TARGET_XFER_E_IO
+   otherwise.  */
+
+extern enum target_xfer_status
+  exec_read_partial_read_only (gdb_byte *readbuf, ULONGEST offset,
+                              ULONGEST len, ULONGEST *xfered_len);
+
 /* Appends all read-only memory ranges found in the target section
    table defined by SECTIONS and SECTIONS_END, starting at (and
    intersected with) MEMADDR for LEN bytes.  Returns the augmented

diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index 3ef109eb158469aaef381501a1823175cf50d9ef..02122eb35b2442db78c2f8b719c8881fee964ced 100644 (file)
--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -938,41 +938,7 @@ tfile_xfer_partial (struct target_ops *ops, enum target_object object,
        }
     }
 
-  /* It's unduly pedantic to refuse to look at the executable for
-     read-only pieces; so do the equivalent of readonly regions aka
-     QTro packet.  */
-  /* FIXME account for relocation at some point.  */
-  if (exec_bfd)
-    {
-      asection *s;
-      bfd_size_type size;
-      bfd_vma vma;
-
-      for (s = exec_bfd->sections; s; s = s->next)
-       {
-         if ((s->flags & SEC_LOAD) == 0
-             || (s->flags & SEC_READONLY) == 0)
-           continue;
-
-         vma = s->vma;
-         size = bfd_get_section_size (s);
-         if (vma <= offset && offset < (vma + size))
-           {
-             ULONGEST amt;
-
-             amt = (vma + size) - offset;
-             if (amt > len)
-               amt = len;
-
-             *xfered_len = bfd_get_section_contents (exec_bfd, s,
-                                                     readbuf, offset - vma, amt);
-             return TARGET_XFER_OK;
-           }
-       }
-    }
-
-  /* Indicate failure to find the requested memory block.  */
-  return TARGET_XFER_E_IO;
+  return exec_read_partial_read_only (readbuf, offset, len, xfered_len);
 }
 
 /* Iterate through the blocks of a trace frame, looking for a 'V'

diff --git a/gdb/tracefile.c b/gdb/tracefile.c
index 508f898dfe676e4f4052a90f0fbfbeec2fce6b60..a7c3cf7fe31a44132e3ba3bf211acd4bf4882913 100644 (file)
--- a/gdb/tracefile.c
+++ b/gdb/tracefile.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 #include "tracefile.h"
 #include "ctf.h"
+#include "exec.h"
 
 /* Helper macros.  */