Use class to manage BFD reference counts

[deliverable/binutils-gdb.git] / gdb / gcore.c

diff --git a/gdb/gcore.c b/gdb/gcore.c
index 3ab9f9615d4ca5f9a8164044cdf0d247baf75e54..1d8a63f04cf4e2b0a487c7b8af73bb9f2bc3028f 100644 (file)
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -1,13 +1,12 @@
 /* Generate a core file for the inferior process.
 
 /* Generate a core file for the inferior process.
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2017 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "elf-bfd.h"
 
 #include "defs.h"
 #include "elf-bfd.h"


@@ -26,97 +23,171 @@
 #include "inferior.h"
 #include "gdbcore.h"
 #include "objfiles.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "objfiles.h"

+#include "solib.h"

 #include "symfile.h"
 #include "symfile.h"

-
+#include "arch-utils.h"
+#include "completer.h"
+#include "gcore.h"

 #include "cli/cli-decode.h"
 #include "cli/cli-decode.h"

-
-#include "gdb_assert.h"
+#include <fcntl.h>
+#include "regcache.h"
+#include "regset.h"
+#include "gdb_bfd.h"
+#include "readline/tilde.h"
+#include <algorithm>

 
 /* The largest amount of memory to read from the target at once.  We
    must throttle it to limit the amount of memory used by GDB during
    generate-core-file for programs with large resident data.  */
 #define MAX_COPY_BYTES (1024 * 1024)
 
 
 /* The largest amount of memory to read from the target at once.  We
    must throttle it to limit the amount of memory used by GDB during
    generate-core-file for programs with large resident data.  */
 #define MAX_COPY_BYTES (1024 * 1024)
 

-static char *default_gcore_target (void);
+static const char *default_gcore_target (void);

 static enum bfd_architecture default_gcore_arch (void);
 static unsigned long default_gcore_mach (void);
 static int gcore_memory_sections (bfd *);
 
 static enum bfd_architecture default_gcore_arch (void);
 static unsigned long default_gcore_mach (void);
 static int gcore_memory_sections (bfd *);
 

-/* Generate a core file from the inferior process.  */
+/* create_gcore_bfd -- helper for gcore_command (exported).
+   Open a new bfd core file for output, and return the handle.  */
+
+gdb_bfd_ref_ptr
+create_gcore_bfd (const char *filename)
+{
+  gdb_bfd_ref_ptr obfd (gdb_bfd_openw (filename, default_gcore_target ()));
+
+  if (obfd == NULL)
+    error (_("Failed to open '%s' for output."), filename);
+  bfd_set_format (obfd.get (), bfd_core);
+  bfd_set_arch_mach (obfd.get (), default_gcore_arch (), default_gcore_mach ());
+  return obfd;
+}
+
+/* write_gcore_file_1 -- do the actual work of write_gcore_file.  */

 
 static void
 
 static void

-gcore_command (char *args, int from_tty)
+write_gcore_file_1 (bfd *obfd)

 {
 {

-  struct cleanup *old_chain;
-  char *corefilename, corefilename_buffer[40];
-  asection *note_sec = NULL;
-  bfd *obfd;
+  struct cleanup *cleanup;

   void *note_data = NULL;
   int note_size = 0;
   void *note_data = NULL;
   int note_size = 0;

+  asection *note_sec = NULL;
+
+  /* An external target method must build the notes section.  */
+  /* FIXME: uweigand/2011-10-06: All architectures that support core file
+     generation should be converted to gdbarch_make_corefile_notes; at that
+     point, the target vector method can be removed.  */
+  if (!gdbarch_make_corefile_notes_p (target_gdbarch ()))
+    note_data = target_make_corefile_notes (obfd, &note_size);
+  else
+    note_data = gdbarch_make_corefile_notes (target_gdbarch (), obfd, &note_size);
+
+  cleanup = make_cleanup (xfree, note_data);
+
+  if (note_data == NULL || note_size == 0)
+    error (_("Target does not support core file generation."));
+
+  /* Create the note section.  */
+  note_sec = bfd_make_section_anyway_with_flags (obfd, "note0",
+                                                SEC_HAS_CONTENTS
+                                                | SEC_READONLY
+                                                | SEC_ALLOC);
+  if (note_sec == NULL)
+    error (_("Failed to create 'note' section for corefile: %s"),
+          bfd_errmsg (bfd_get_error ()));
+
+  bfd_set_section_vma (obfd, note_sec, 0);
+  bfd_set_section_alignment (obfd, note_sec, 0);
+  bfd_set_section_size (obfd, note_sec, note_size);
+
+  /* Now create the memory/load sections.  */
+  if (gcore_memory_sections (obfd) == 0)
+    error (_("gcore: failed to get corefile memory sections from target."));
+
+  /* Write out the contents of the note section.  */
+  if (!bfd_set_section_contents (obfd, note_sec, note_data, 0, note_size))
+    warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ()));
+
+  do_cleanups (cleanup);
+}
+
+/* write_gcore_file -- helper for gcore_command (exported).
+   Compose and write the corefile data to the core file.  */
+
+void
+write_gcore_file (bfd *obfd)
+{
+  struct gdb_exception except = exception_none;
+
+  target_prepare_to_generate_core ();
+
+  TRY
+    {
+      write_gcore_file_1 (obfd);
+    }
+  CATCH (e, RETURN_MASK_ALL)
+    {
+      except = e;
+    }
+  END_CATCH
+
+  target_done_generating_core ();
+
+  if (except.reason < 0)
+    throw_exception (except);
+}
+
+static void
+do_bfd_delete_cleanup (void *arg)
+{
+  bfd *obfd = (bfd *) arg;
+  const char *filename = obfd->filename;
+
+  gdb_bfd_unref ((bfd *) arg);
+  unlink (filename);
+}
+
+/* gcore_command -- implements the 'gcore' command.
+   Generate a core file from the inferior process.  */
+
+static void
+gcore_command (char *args, int from_tty)
+{
+  struct cleanup *filename_chain;
+  struct cleanup *bfd_chain;
+  char *corefilename;
+  bfd *obfd;

 
   /* No use generating a corefile without a target process.  */
   if (!target_has_execution)
     noprocess ();
 
   if (args && *args)
 
   /* No use generating a corefile without a target process.  */
   if (!target_has_execution)
     noprocess ();
 
   if (args && *args)

-    corefilename = args;
+    corefilename = tilde_expand (args);

   else
     {
       /* Default corefile name is "core.PID".  */
   else
     {
       /* Default corefile name is "core.PID".  */

-      sprintf (corefilename_buffer, "core.%d", PIDGET (inferior_ptid));
-      corefilename = corefilename_buffer;
+      corefilename = xstrprintf ("core.%d", ptid_get_pid (inferior_ptid));

     }
     }

+  filename_chain = make_cleanup (xfree, corefilename);

 
   if (info_verbose)
     fprintf_filtered (gdb_stdout,
                      "Opening corefile '%s' for output.\n", corefilename);
 
   /* Open the output file.  */
 
   if (info_verbose)
     fprintf_filtered (gdb_stdout,
                      "Opening corefile '%s' for output.\n", corefilename);
 
   /* Open the output file.  */

-  obfd = bfd_openw (corefilename, default_gcore_target ());
-  if (!obfd)
-    error (_("Failed to open '%s' for output."), corefilename);
-
-  /* Need a cleanup that will close the file (FIXME: delete it?).  */
-  old_chain = make_cleanup_bfd_close (obfd);
-
-  bfd_set_format (obfd, bfd_core);
-  bfd_set_arch_mach (obfd, default_gcore_arch (), default_gcore_mach ());
-
-  /* An external target method must build the notes section.  */
-  note_data = target_make_corefile_notes (obfd, &note_size);
-
-  /* Create the note section.  */
-  if (note_data != NULL && note_size != 0)
-    {
-      note_sec = bfd_make_section_anyway (obfd, "note0");
-      if (note_sec == NULL)
-       error (_("Failed to create 'note' section for corefile: %s"),
-              bfd_errmsg (bfd_get_error ()));
+  obfd = create_gcore_bfd (corefilename).release ();

 
 

-      bfd_set_section_vma (obfd, note_sec, 0);
-      bfd_set_section_flags (obfd, note_sec,
-                            SEC_HAS_CONTENTS | SEC_READONLY | SEC_ALLOC);
-      bfd_set_section_alignment (obfd, note_sec, 0);
-      bfd_set_section_size (obfd, note_sec, note_size);
-    }
-
-  /* Now create the memory/load sections.  */
-  if (gcore_memory_sections (obfd) == 0)
-    error (_("gcore: failed to get corefile memory sections from target."));
+  /* Need a cleanup that will close and delete the file.  */
+  bfd_chain = make_cleanup (do_bfd_delete_cleanup, obfd);

 
 

-  /* Write out the contents of the note section.  */
-  if (note_data != NULL && note_size != 0)
-    {
-      if (!bfd_set_section_contents (obfd, note_sec, note_data, 0, note_size))
-       warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ()));
-    }
+  /* Call worker function.  */
+  write_gcore_file (obfd);

 
   /* Succeeded.  */
 
   /* Succeeded.  */

-  fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename);
+  discard_cleanups (bfd_chain);
+  gdb_bfd_unref (obfd);

 
 

-  /* Clean-ups will close the output file and free malloc memory.  */
-  do_cleanups (old_chain);
-  return;
+  fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename);
+  do_cleanups (filename_chain);

 }
 
 static unsigned long
 }
 
 static unsigned long


@@ -126,7 +197,7 @@ default_gcore_mach (void)
   return 0;
 #else
 
   return 0;
 #else
 

-  const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (current_gdbarch);
+  const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch ());

 
   if (bfdarch != NULL)
     return bfdarch->mach;
 
   if (bfdarch != NULL)
     return bfdarch->mach;


@@ -140,8 +211,7 @@ default_gcore_mach (void)
 static enum bfd_architecture
 default_gcore_arch (void)
 {
 static enum bfd_architecture
 default_gcore_arch (void)
 {

-  const struct bfd_arch_info * bfdarch = gdbarch_bfd_arch_info
-                                        (current_gdbarch);
+  const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch ());

 
   if (bfdarch != NULL)
     return bfdarch->arch;
 
   if (bfdarch != NULL)
     return bfdarch->arch;


@@ -151,10 +221,15 @@ default_gcore_arch (void)
   return bfd_get_arch (exec_bfd);
 }
 
   return bfd_get_arch (exec_bfd);
 }
 

-static char *
+static const char *

 default_gcore_target (void)
 {
 default_gcore_target (void)
 {

-  /* FIXME: This may only work for ELF targets.  */
+  /* The gdbarch may define a target to use for core files.  */
+  if (gdbarch_gcore_bfd_target_p (target_gdbarch ()))
+    return gdbarch_gcore_bfd_target (target_gdbarch ());
+
+  /* Otherwise, try to fall back to the exec_bfd target.  This will probably
+     not work for non-ELF targets.  */

   if (exec_bfd == NULL)
     return NULL;
   else
   if (exec_bfd == NULL)
     return NULL;
   else


@@ -185,7 +260,7 @@ derive_stack_segment (bfd_vma *bottom, bfd_vma *top)
   /* Save frame pointer of TOS frame.  */
   *top = get_frame_base (fi);
   /* If current stack pointer is more "inner", use that instead.  */
   /* Save frame pointer of TOS frame.  */
   *top = get_frame_base (fi);
   /* If current stack pointer is more "inner", use that instead.  */

-  if (gdbarch_inner_than (current_gdbarch, get_frame_sp (fi), *top))
+  if (gdbarch_inner_than (get_frame_arch (fi), get_frame_sp (fi), *top))

     *top = get_frame_sp (fi);
 
   /* Find prev-most frame.  */
     *top = get_frame_sp (fi);
 
   /* Find prev-most frame.  */


@@ -209,6 +284,50 @@ derive_stack_segment (bfd_vma *bottom, bfd_vma *top)
   return 1;
 }
 
   return 1;
 }
 

+/* call_target_sbrk --
+   helper function for derive_heap_segment.  */
+
+static bfd_vma
+call_target_sbrk (int sbrk_arg)
+{
+  struct objfile *sbrk_objf;
+  struct gdbarch *gdbarch;
+  bfd_vma top_of_heap;
+  struct value *target_sbrk_arg;
+  struct value *sbrk_fn, *ret;
+  bfd_vma tmp;
+
+  if (lookup_minimal_symbol ("sbrk", NULL, NULL).minsym != NULL)
+    {
+      sbrk_fn = find_function_in_inferior ("sbrk", &sbrk_objf);
+      if (sbrk_fn == NULL)
+       return (bfd_vma) 0;
+    }
+  else if (lookup_minimal_symbol ("_sbrk", NULL, NULL).minsym != NULL)
+    {
+      sbrk_fn = find_function_in_inferior ("_sbrk", &sbrk_objf);
+      if (sbrk_fn == NULL)
+       return (bfd_vma) 0;
+    }
+  else
+    return (bfd_vma) 0;
+
+  gdbarch = get_objfile_arch (sbrk_objf);
+  target_sbrk_arg = value_from_longest (builtin_type (gdbarch)->builtin_int, 
+                                       sbrk_arg);
+  gdb_assert (target_sbrk_arg);
+  ret = call_function_by_hand (sbrk_fn, 1, &target_sbrk_arg);
+  if (ret == NULL)
+    return (bfd_vma) 0;
+
+  tmp = value_as_long (ret);
+  if ((LONGEST) tmp <= 0 || (LONGEST) tmp == 0xffffffff)
+    return (bfd_vma) 0;
+
+  top_of_heap = tmp;
+  return top_of_heap;
+}
+

 /* Derive a reasonable heap segment for ABFD by looking at sbrk and
    the static data sections.  Store its limits in *BOTTOM and *TOP.
    Return non-zero if successful.  */
 /* Derive a reasonable heap segment for ABFD by looking at sbrk and
    the static data sections.  Store its limits in *BOTTOM and *TOP.
    Return non-zero if successful.  */


@@ -219,7 +338,6 @@ derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top)
   bfd_vma top_of_data_memory = 0;
   bfd_vma top_of_heap = 0;
   bfd_size_type sec_size;
   bfd_vma top_of_data_memory = 0;
   bfd_vma top_of_heap = 0;
   bfd_size_type sec_size;

-  struct value *zero, *sbrk;

   bfd_vma sec_vaddr;
   asection *sec;
 
   bfd_vma sec_vaddr;
   asection *sec;
 


@@ -254,28 +372,9 @@ derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top)
        }
     }
 
        }
     }
 

-  /* Now get the top-of-heap by calling sbrk in the inferior.  */
-  if (lookup_minimal_symbol ("sbrk", NULL, NULL) != NULL)
-    {
-      sbrk = find_function_in_inferior ("sbrk");
-      if (sbrk == NULL)
-       return 0;
-    }
-  else if (lookup_minimal_symbol ("_sbrk", NULL, NULL) != NULL)
-    {
-      sbrk = find_function_in_inferior ("_sbrk");
-      if (sbrk == NULL)
-       return 0;
-    }
-  else
-    return 0;
-
-  zero = value_from_longest (builtin_type_int, 0);
-  gdb_assert (zero);
-  sbrk = call_function_by_hand (sbrk, 1, &zero);
-  if (sbrk == NULL)
+  top_of_heap = call_target_sbrk (0);
+  if (top_of_heap == (bfd_vma) 0)

     return 0;
     return 0;

-  top_of_heap = value_as_long (sbrk);

 
   /* Return results.  */
   if (top_of_heap > top_of_data_memory)
 
   /* Return results.  */
   if (top_of_heap > top_of_data_memory)


@@ -293,13 +392,15 @@ static void
 make_output_phdrs (bfd *obfd, asection *osec, void *ignored)
 {
   int p_flags = 0;
 make_output_phdrs (bfd *obfd, asection *osec, void *ignored)
 {
   int p_flags = 0;

-  int p_type;
+  int p_type = 0;

 
   /* FIXME: these constants may only be applicable for ELF.  */
 
   /* FIXME: these constants may only be applicable for ELF.  */

-  if (strncmp (bfd_section_name (obfd, osec), "load", 4) == 0)
+  if (startswith (bfd_section_name (obfd, osec), "load"))

     p_type = PT_LOAD;
     p_type = PT_LOAD;

-  else
+  else if (startswith (bfd_section_name (obfd, osec), "note"))

     p_type = PT_NOTE;
     p_type = PT_NOTE;

+  else
+    p_type = PT_NULL;

 
   p_flags |= PF_R;     /* Segment is readable.  */
   if (!(bfd_get_section_flags (obfd, osec) & SEC_READONLY))
 
   p_flags |= PF_R;     /* Segment is readable.  */
   if (!(bfd_get_section_flags (obfd, osec) & SEC_READONLY))


@@ -310,29 +411,32 @@ make_output_phdrs (bfd *obfd, asection *osec, void *ignored)
   bfd_record_phdr (obfd, p_type, 1, p_flags, 0, 0, 0, 0, 1, &osec);
 }
 
   bfd_record_phdr (obfd, p_type, 1, p_flags, 0, 0, 0, 0, 1, &osec);
 }
 

+/* find_memory_region_ftype implementation.  DATA is 'bfd *' for the core file
+   GDB is creating.  */
+

 static int
 static int

-gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
-                      int read, int write, int exec, void *data)
+gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read,
+                      int write, int exec, int modified, void *data)

 {
 {

-  bfd *obfd = data;
+  bfd *obfd = (bfd *) data;

   asection *osec;
   flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD;
 
   /* If the memory segment has no permissions set, ignore it, otherwise
      when we later try to access it for read/write, we'll get an error
      or jam the kernel.  */
   asection *osec;
   flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD;
 
   /* If the memory segment has no permissions set, ignore it, otherwise
      when we later try to access it for read/write, we'll get an error
      or jam the kernel.  */

-  if (read == 0 && write == 0 && exec == 0)
+  if (read == 0 && write == 0 && exec == 0 && modified == 0)

     {
       if (info_verbose)
         {
     {
       if (info_verbose)
         {

-          fprintf_filtered (gdb_stdout, "Ignore segment, %s bytes at 0x%s\n",
-                           paddr_d (size), paddr_nz (vaddr));
+          fprintf_filtered (gdb_stdout, "Ignore segment, %s bytes at %s\n",
+                            plongest (size), paddress (target_gdbarch (), vaddr));

         }
 
       return 0;
     }
 
         }
 
       return 0;
     }
 

-  if (write == 0)
+  if (write == 0 && modified == 0 && !solib_keep_data_in_core (vaddr, size))

     {
       /* See if this region of memory lies inside a known file on disk.
         If so, we can avoid copying its contents by clearing SEC_LOAD.  */
     {
       /* See if this region of memory lies inside a known file on disk.
         If so, we can avoid copying its contents by clearing SEC_LOAD.  */


@@ -345,8 +449,9 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
          asection *asec = objsec->the_bfd_section;
          bfd_vma align = (bfd_vma) 1 << bfd_get_section_alignment (abfd,
                                                                    asec);
          asection *asec = objsec->the_bfd_section;
          bfd_vma align = (bfd_vma) 1 << bfd_get_section_alignment (abfd,
                                                                    asec);

-         bfd_vma start = objsec->addr & -align;
-         bfd_vma end = (objsec->endaddr + align - 1) & -align;
+         bfd_vma start = obj_section_addr (objsec) & -align;
+         bfd_vma end = (obj_section_endaddr (objsec) + align - 1) & -align;
+

          /* Match if either the entire memory region lies inside the
             section (i.e. a mapping covering some pages of a large
             segment) or the entire section lies inside the memory region
          /* Match if either the entire memory region lies inside the
             section (i.e. a mapping covering some pages of a large
             segment) or the entire section lies inside the memory region


@@ -354,25 +459,28 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
 
             This BFD was synthesized from reading target memory,
             we don't want to omit that.  */
 
             This BFD was synthesized from reading target memory,
             we don't want to omit that.  */

-         if (((vaddr >= start && vaddr + size <= end)
-              || (start >= vaddr && end <= vaddr + size))
+         if (objfile->separate_debug_objfile_backlink == NULL
+             && ((vaddr >= start && vaddr + size <= end)
+                 || (start >= vaddr && end <= vaddr + size))

              && !(bfd_get_file_flags (abfd) & BFD_IN_MEMORY))
            {
              && !(bfd_get_file_flags (abfd) & BFD_IN_MEMORY))
            {

-             flags &= ~SEC_LOAD;
-             goto keep;        /* break out of two nested for loops */
+             flags &= ~(SEC_LOAD | SEC_HAS_CONTENTS);
+             goto keep;        /* Break out of two nested for loops.  */

            }
        }
 
            }
        }
 

-    keep:
-      flags |= SEC_READONLY;
+    keep:;

     }
 
     }
 

+  if (write == 0)
+    flags |= SEC_READONLY;
+

   if (exec)
     flags |= SEC_CODE;
   else
     flags |= SEC_DATA;
 
   if (exec)
     flags |= SEC_CODE;
   else
     flags |= SEC_DATA;
 

-  osec = bfd_make_section_anyway (obfd, "load");
+  osec = bfd_make_section_anyway_with_flags (obfd, "load", flags);

   if (osec == NULL)
     {
       warning (_("Couldn't make gcore segment: %s"),
   if (osec == NULL)
     {
       warning (_("Couldn't make gcore segment: %s"),


@@ -382,21 +490,19 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
 
   if (info_verbose)
     {
 
   if (info_verbose)
     {

-      fprintf_filtered (gdb_stdout, "Save segment, %s bytes at 0x%s\n",
-                       paddr_d (size), paddr_nz (vaddr));
+      fprintf_filtered (gdb_stdout, "Save segment, %s bytes at %s\n",
+                       plongest (size), paddress (target_gdbarch (), vaddr));

     }
 
   bfd_set_section_size (obfd, osec, size);
   bfd_set_section_vma (obfd, osec, vaddr);
   bfd_section_lma (obfd, osec) = 0; /* ??? bfd_set_section_lma?  */
     }
 
   bfd_set_section_size (obfd, osec, size);
   bfd_set_section_vma (obfd, osec, vaddr);
   bfd_section_lma (obfd, osec) = 0; /* ??? bfd_set_section_lma?  */

-  bfd_set_section_flags (obfd, osec, flags);

   return 0;
 }
 
   return 0;
 }
 

-static int
-objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
-                                         int, int, int, void *),
-                            void *obfd)
+int
+objfile_find_memory_regions (struct target_ops *self,
+                            find_memory_region_ftype func, void *obfd)

 {
   /* Use objfile data to create memory sections.  */
   struct objfile *objfile;
 {
   /* Use objfile data to create memory sections.  */
   struct objfile *objfile;


@@ -409,17 +515,21 @@ objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
       bfd *ibfd = objfile->obfd;
       asection *isec = objsec->the_bfd_section;
       flagword flags = bfd_get_section_flags (ibfd, isec);
       bfd *ibfd = objfile->obfd;
       asection *isec = objsec->the_bfd_section;
       flagword flags = bfd_get_section_flags (ibfd, isec);

-      int ret;
+
+      /* Separate debug info files are irrelevant for gcore.  */
+      if (objfile->separate_debug_objfile_backlink != NULL)
+       continue;

 
       if ((flags & SEC_ALLOC) || (flags & SEC_LOAD))
        {
          int size = bfd_section_size (ibfd, isec);
          int ret;
 
 
       if ((flags & SEC_ALLOC) || (flags & SEC_LOAD))
        {
          int size = bfd_section_size (ibfd, isec);
          int ret;
 

-         ret = (*func) (objsec->addr, bfd_section_size (ibfd, isec),
+         ret = (*func) (obj_section_addr (objsec), size, 

                         1, /* All sections will be readable.  */
                         (flags & SEC_READONLY) == 0, /* Writable.  */
                         (flags & SEC_CODE) != 0, /* Executable.  */
                         1, /* All sections will be readable.  */
                         (flags & SEC_READONLY) == 0, /* Writable.  */
                         (flags & SEC_CODE) != 0, /* Executable.  */

+                        1, /* MODIFIED is unknown, pass it as true.  */

                         obfd);
          if (ret != 0)
            return ret;
                         obfd);
          if (ret != 0)
            return ret;


@@ -432,14 +542,16 @@ objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
             1, /* Stack section will be readable.  */
             1, /* Stack section will be writable.  */
             0, /* Stack section will not be executable.  */
             1, /* Stack section will be readable.  */
             1, /* Stack section will be writable.  */
             0, /* Stack section will not be executable.  */

+            1, /* Stack section will be modified.  */

             obfd);
 
             obfd);
 

-  /* Make a heap segment. */
+  /* Make a heap segment.  */

   if (derive_heap_segment (exec_bfd, &temp_bottom, &temp_top))
     (*func) (temp_bottom, temp_top - temp_bottom,
             1, /* Heap section will be readable.  */
             1, /* Heap section will be writable.  */
             0, /* Heap section will not be executable.  */
   if (derive_heap_segment (exec_bfd, &temp_bottom, &temp_top))
     (*func) (temp_bottom, temp_top - temp_bottom,
             1, /* Heap section will be readable.  */
             1, /* Heap section will be writable.  */
             0, /* Heap section will not be executable.  */

+            1, /* Heap section will be modified.  */

             obfd);
 
   return 0;
             obfd);
 
   return 0;


@@ -451,21 +563,18 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
   bfd_size_type size, total_size = bfd_section_size (obfd, osec);
   file_ptr offset = 0;
   struct cleanup *old_chain = NULL;
   bfd_size_type size, total_size = bfd_section_size (obfd, osec);
   file_ptr offset = 0;
   struct cleanup *old_chain = NULL;

-  void *memhunk;
+  gdb_byte *memhunk;

 
   /* Read-only sections are marked; we don't have to copy their contents.  */
   if ((bfd_get_section_flags (obfd, osec) & SEC_LOAD) == 0)
     return;
 
   /* Only interested in "load" sections.  */
 
   /* Read-only sections are marked; we don't have to copy their contents.  */
   if ((bfd_get_section_flags (obfd, osec) & SEC_LOAD) == 0)
     return;
 
   /* Only interested in "load" sections.  */

-  if (strncmp ("load", bfd_section_name (obfd, osec), 4) != 0)
+  if (!startswith (bfd_section_name (obfd, osec), "load"))

     return;
 
     return;
 

-  size = min (total_size, MAX_COPY_BYTES);
-  memhunk = xmalloc (size);
-  /* ??? This is crap since xmalloc should never return NULL.  */
-  if (memhunk == NULL)
-    error (_("Not enough memory to create corefile."));
+  size = std::min (total_size, (bfd_size_type) MAX_COPY_BYTES);
+  memhunk = (gdb_byte *) xmalloc (size);

   old_chain = make_cleanup (xfree, memhunk);
 
   while (total_size > 0)
   old_chain = make_cleanup (xfree, memhunk);
 
   while (total_size > 0)


@@ -476,8 +585,10 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
       if (target_read_memory (bfd_section_vma (obfd, osec) + offset,
                              memhunk, size) != 0)
        {
       if (target_read_memory (bfd_section_vma (obfd, osec) + offset,
                              memhunk, size) != 0)
        {

-         warning (_("Memory read failed for corefile section, %s bytes at 0x%s."),
-                  paddr_d (size), paddr (bfd_section_vma (obfd, osec)));
+         warning (_("Memory read failed for corefile "
+                    "section, %s bytes at %s."),
+                  plongest (size),
+                  paddress (target_gdbarch (), bfd_section_vma (obfd, osec)));

          break;
        }
       if (!bfd_set_section_contents (obfd, osec, memhunk, offset, size))
          break;
        }
       if (!bfd_set_section_contents (obfd, osec, memhunk, offset, size))


@@ -497,8 +608,14 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
 static int
 gcore_memory_sections (bfd *obfd)
 {
 static int
 gcore_memory_sections (bfd *obfd)
 {

-  if (target_find_memory_regions (gcore_create_callback, obfd) != 0)
-    return 0;                  /* FIXME: error return/msg?  */
+  /* Try gdbarch method first, then fall back to target method.  */
+  if (!gdbarch_find_memory_regions_p (target_gdbarch ())
+      || gdbarch_find_memory_regions (target_gdbarch (),
+                                     gcore_create_callback, obfd) != 0)
+    {
+      if (target_find_memory_regions (gcore_create_callback, obfd) != 0)
+       return 0;                       /* FIXME: error return/msg?  */
+    }

 
   /* Record phdrs for section-to-segment mapping.  */
   bfd_map_over_sections (obfd, make_output_phdrs, NULL);
 
   /* Record phdrs for section-to-segment mapping.  */
   bfd_map_over_sections (obfd, make_output_phdrs, NULL);


@@ -509,6 +626,9 @@ gcore_memory_sections (bfd *obfd)
   return 1;
 }
 
   return 1;
 }
 

+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_gcore;
+

 void
 _initialize_gcore (void)
 {
 void
 _initialize_gcore (void)
 {


@@ -517,5 +637,4 @@ Save a core file with the current state of the debugged process.\n\
 Argument is optional filename.  Default filename is 'core.<process_id>'."));
 
   add_com_alias ("gcore", "generate-core-file", class_files, 1);
 Argument is optional filename.  Default filename is 'core.<process_id>'."));
 
   add_com_alias ("gcore", "generate-core-file", class_files, 1);

-  exec_set_find_memory_regions (objfile_find_memory_regions);

 }
 }