PR gas/11395

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

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

-   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   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,


@@ -15,9 +16,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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, 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"


@@ -25,56 +24,52 @@
 #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 "gdb_assert.h"

+#include <fcntl.h>
+#include "regcache.h"
+#include "regset.h"

 
 

-static char *default_gcore_target (void);
+/* 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 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.  */

 
 

-static void
-gcore_command (char *args, int from_tty)
+bfd *
+create_gcore_bfd (char *filename)

 {
 {

-  struct cleanup *old_chain;
-  char *corefilename, corefilename_buffer[40];
-  asection *note_sec = NULL;
-  bfd *obfd;
-  void *note_data = NULL;
-  int note_size = 0;
-
-  /* No use generating a corefile without a target process.  */
-  if (!target_has_execution)
-    noprocess ();
+  bfd *obfd = bfd_openw (filename, default_gcore_target ());

 
 

-  if (args && *args)
-    corefilename = args;
-  else
-    {
-      /* Default corefile name is "core.PID".  */
-      sprintf (corefilename_buffer, "core.%d", PIDGET (inferior_ptid));
-      corefilename = corefilename_buffer;
-    }
-
-  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)
   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);
-
+    error (_("Failed to open '%s' for output."), filename);

   bfd_set_format (obfd, bfd_core);
   bfd_set_arch_mach (obfd, default_gcore_arch (), default_gcore_mach ());
   bfd_set_format (obfd, bfd_core);
   bfd_set_arch_mach (obfd, default_gcore_arch (), default_gcore_mach ());

+  return obfd;
+}
+
+/* write_gcore_file -- helper for gcore_command (exported).
+   Compose and write the corefile data to the core file.  */
+
+
+void
+write_gcore_file (bfd *obfd)
+{
+  void *note_data = NULL;
+  int note_size = 0;
+  asection *note_sec = NULL;

 
   /* An external target method must build the notes section.  */
   note_data = target_make_corefile_notes (obfd, &note_size);
 
   /* An external target method must build the notes section.  */
   note_data = target_make_corefile_notes (obfd, &note_size);


@@ -82,35 +77,83 @@ gcore_command (char *args, int from_tty)
   /* Create the note section.  */
   if (note_data != NULL && note_size != 0)
     {
   /* Create the note section.  */
   if (note_data != NULL && note_size != 0)
     {

-      note_sec = bfd_make_section_anyway (obfd, "note0");
+      note_sec = bfd_make_section_anyway_with_flags (obfd, "note0",
+                                                    SEC_HAS_CONTENTS
+                                                    | SEC_READONLY
+                                                    | SEC_ALLOC);

       if (note_sec == NULL)
       if (note_sec == NULL)

-       error ("Failed to create 'note' section for corefile: %s",
+       error (_("Failed to create 'note' section for corefile: %s"),

               bfd_errmsg (bfd_get_error ()));
 
       bfd_set_section_vma (obfd, note_sec, 0);
               bfd_errmsg (bfd_get_error ()));
 
       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)
       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.");
+    error (_("gcore: failed to get corefile memory sections from target."));

 
   /* 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))
 
   /* 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 ()));
+       warning (_("writing note section (%s)"), 
+                bfd_errmsg (bfd_get_error ()));
+    }
+}
+
+static void
+do_bfd_delete_cleanup (void *arg)
+{
+  bfd *obfd = arg;
+  const char *filename = obfd->filename;
+
+  bfd_close (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 *old_chain;
+  char *corefilename, corefilename_buffer[40];
+  bfd *obfd;
+
+  /* No use generating a corefile without a target process.  */
+  if (!target_has_execution)
+    noprocess ();
+
+  if (args && *args)
+    corefilename = args;
+  else
+    {
+      /* Default corefile name is "core.PID".  */
+      sprintf (corefilename_buffer, "core.%d", PIDGET (inferior_ptid));
+      corefilename = corefilename_buffer;

     }
 
     }
 

+  if (info_verbose)
+    fprintf_filtered (gdb_stdout,
+                     "Opening corefile '%s' for output.\n", corefilename);
+
+  /* Open the output file.  */
+  obfd = create_gcore_bfd (corefilename);
+
+  /* Need a cleanup that will close and delete the file.  */
+  old_chain = make_cleanup (do_bfd_delete_cleanup, obfd);
+
+  /* Call worker function.  */
+  write_gcore_file (obfd);
+

   /* Succeeded.  */
   fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename);
 
   /* Succeeded.  */
   fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename);
 

-  /* Clean-ups will close the output file and free malloc memory.  */
-  do_cleanups (old_chain);
-  return;
+  discard_cleanups (old_chain);
+  bfd_close (obfd);

 }
 
 static unsigned long
 }
 
 static unsigned long


@@ -119,14 +162,13 @@ default_gcore_mach (void)
 #if 1  /* See if this even matters...  */
   return 0;
 #else
 #if 1  /* See if this even matters...  */
   return 0;
 #else

-#ifdef TARGET_ARCHITECTURE
-  const struct bfd_arch_info *bfdarch = TARGET_ARCHITECTURE;
+
+  const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch);

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

-#endif /* TARGET_ARCHITECTURE */

   if (exec_bfd == NULL)
   if (exec_bfd == NULL)

-    error ("Can't find default bfd machine type (need execfile).");
+    error (_("Can't find default bfd machine type (need execfile)."));

 
   return bfd_get_mach (exec_bfd);
 #endif /* 1 */
 
   return bfd_get_mach (exec_bfd);
 #endif /* 1 */


@@ -135,22 +177,25 @@ default_gcore_mach (void)
 static enum bfd_architecture
 default_gcore_arch (void)
 {
 static enum bfd_architecture
 default_gcore_arch (void)
 {

-#ifdef TARGET_ARCHITECTURE
-  const struct bfd_arch_info * bfdarch = TARGET_ARCHITECTURE;
+  const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch);

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

-#endif

   if (exec_bfd == NULL)
   if (exec_bfd == NULL)

-    error ("Can't find bfd architecture for corefile (need execfile).");
+    error (_("Can't find bfd architecture for corefile (need execfile)."));

 
   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


@@ -181,8 +226,8 @@ 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 (INNER_THAN (read_sp (), *top))
-    *top = read_sp ();
+  if (gdbarch_inner_than (get_frame_arch (fi), get_frame_sp (fi), *top))
+    *top = get_frame_sp (fi);

 
   /* Find prev-most frame.  */
   while ((tmp_fi = get_prev_frame (fi)) != NULL)
 
   /* Find prev-most frame.  */
   while ((tmp_fi = get_prev_frame (fi)) != NULL)


@@ -205,6 +250,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) != 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) != 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.  */


@@ -215,7 +304,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;
 


@@ -244,34 +332,15 @@ derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top)
          || strcmp (".bss", bfd_section_name (abfd, sec)) == 0)
        {
          sec_vaddr = bfd_get_section_vma (abfd, sec);
          || strcmp (".bss", bfd_section_name (abfd, sec)) == 0)
        {
          sec_vaddr = bfd_get_section_vma (abfd, sec);

-         sec_size = bfd_get_section_size_before_reloc (sec);
+         sec_size = bfd_get_section_size (sec);

          if (sec_vaddr + sec_size > top_of_data_memory)
            top_of_data_memory = sec_vaddr + sec_size;
        }
     }
 
          if (sec_vaddr + sec_size > top_of_data_memory)
            top_of_data_memory = sec_vaddr + sec_size;
        }
     }
 

-  /* 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)


@@ -289,13 +358,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.  */
   if (strncmp (bfd_section_name (obfd, osec), "load", 4) == 0)
     p_type = PT_LOAD;
 
   /* FIXME: these constants may only be applicable for ELF.  */
   if (strncmp (bfd_section_name (obfd, osec), "load", 4) == 0)
     p_type = PT_LOAD;

-  else
+  else if (strncmp (bfd_section_name (obfd, osec), "note", 4) == 0)

     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))


@@ -314,7 +385,21 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
   asection *osec;
   flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD;
 
   asection *osec;
   flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD;
 

-  if (write == 0)
+  /* 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 (info_verbose)
+        {
+          fprintf_filtered (gdb_stdout, "Ignore segment, %s bytes at %s\n",
+                            plongest (size), paddress (target_gdbarch, vaddr));
+        }
+
+      return 0;
+    }
+
+  if (write == 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.  */


@@ -327,8 +412,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


@@ -340,7 +426,7 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
               || (start >= vaddr && end <= vaddr + size))
              && !(bfd_get_file_flags (abfd) & BFD_IN_MEMORY))
            {
               || (start >= vaddr && end <= vaddr + size))
              && !(bfd_get_file_flags (abfd) & BFD_IN_MEMORY))
            {

-             flags &= ~SEC_LOAD;
+             flags &= ~(SEC_LOAD | SEC_HAS_CONTENTS);

              goto keep;        /* break out of two nested for loops */
            }
        }
              goto keep;        /* break out of two nested for loops */
            }
        }


@@ -354,31 +440,28 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
   else
     flags |= SEC_DATA;
 
   else
     flags |= SEC_DATA;
 

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

   if (osec == NULL)
     {
   if (osec == NULL)
     {

-      warning ("Couldn't make gcore segment: %s",
+      warning (_("Couldn't make gcore segment: %s"),

               bfd_errmsg (bfd_get_error ()));
       return 1;
     }
 
   if (info_verbose)
     {
               bfd_errmsg (bfd_get_error ()));
       return 1;
     }
 
   if (info_verbose)
     {

-      fprintf_filtered (gdb_stdout, "Save segment, %lld bytes at 0x%s\n",
-                       (long long) 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;
 }
 
 static int
   return 0;
 }
 
 static int

-objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
-                                         int, int, int, void *),
-                            void *obfd)
+objfile_find_memory_regions (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;


@@ -391,14 +474,13 @@ 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;

 
       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.  */


@@ -430,7 +512,8 @@ objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
 static void
 gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
 {
 static void
 gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
 {

-  bfd_size_type size = bfd_section_size (obfd, osec);
+  bfd_size_type size, total_size = bfd_section_size (obfd, osec);
+  file_ptr offset = 0;

   struct cleanup *old_chain = NULL;
   void *memhunk;
 
   struct cleanup *old_chain = NULL;
   void *memhunk;
 


@@ -442,19 +525,33 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
   if (strncmp ("load", bfd_section_name (obfd, osec), 4) != 0)
     return;
 
   if (strncmp ("load", bfd_section_name (obfd, osec), 4) != 0)
     return;
 

+  size = min (total_size, MAX_COPY_BYTES);

   memhunk = xmalloc (size);
   memhunk = xmalloc (size);

-  /* ??? This is crap since xmalloc should never return NULL.  */
-  if (memhunk == NULL)
-    error ("Not enough memory to create corefile.");

   old_chain = make_cleanup (xfree, memhunk);
 
   old_chain = make_cleanup (xfree, memhunk);
 

-  if (target_read_memory (bfd_section_vma (obfd, osec),
-                         memhunk, size) != 0)
-    warning ("Memory read failed for corefile section, %ld bytes at 0x%s\n",
-            (long) size, paddr (bfd_section_vma (obfd, osec)));
-  if (!bfd_set_section_contents (obfd, osec, memhunk, 0, size))
-    warning ("Failed to write corefile contents (%s).",
-            bfd_errmsg (bfd_get_error ()));
+  while (total_size > 0)
+    {
+      if (size > total_size)
+       size = total_size;
+
+      if (target_read_memory (bfd_section_vma (obfd, osec) + offset,
+                             memhunk, size) != 0)
+       {
+         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))
+       {
+         warning (_("Failed to write corefile contents (%s)."),
+                  bfd_errmsg (bfd_get_error ()));
+         break;
+       }
+
+      total_size -= size;
+      offset += size;
+    }

 
   do_cleanups (old_chain);     /* Frees MEMHUNK.  */
 }
 
   do_cleanups (old_chain);     /* Frees MEMHUNK.  */
 }


@@ -474,13 +571,15 @@ 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)
 {

-  add_com ("generate-core-file", class_files, gcore_command,
-          "\
+  add_com ("generate-core-file", class_files, gcore_command, _("\

 Save a core file with the current state of the debugged process.\n\
 Save a core file with the current state of the debugged process.\n\

-Argument is optional filename.  Default filename is 'core.<process_id>'.");
+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);
 
   add_com_alias ("gcore", "generate-core-file", class_files, 1);
   exec_set_find_memory_regions (objfile_find_memory_regions);