X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgcore.c;h=67fbf302c4b37ff681cabe8d9745ad8dbf4444ce;hb=749234e5402bddc054d77b4113ecd09eda7a872e;hp=595c6431dd56abb4347a72e69412265771452a96;hpb=b8edc417a7143d28618086f1d6d946201001a075;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gcore.c b/gdb/gcore.c index 595c6431dd..67fbf302c4 100644 --- a/gdb/gcore.c +++ b/gdb/gcore.c @@ -1,7 +1,6 @@ /* Generate a core file for the inferior process. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 2001-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -34,6 +33,8 @@ #include #include "regcache.h" #include "regset.h" +#include "gdb_bfd.h" +#include "readline/tilde.h" /* 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 @@ -49,9 +50,9 @@ static int gcore_memory_sections (bfd *); Open a new bfd core file for output, and return the handle. */ bfd * -create_gcore_bfd (char *filename) +create_gcore_bfd (const char *filename) { - bfd *obfd = bfd_openw (filename, default_gcore_target ()); + bfd *obfd = gdb_bfd_openw (filename, default_gcore_target ()); if (!obfd) error (_("Failed to open '%s' for output."), filename); @@ -72,35 +73,37 @@ write_gcore_file (bfd *obfd) asection *note_sec = NULL; /* An external target method must build the notes section. */ - note_data = target_make_corefile_notes (obfd, ¬e_size); + /* 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, ¬e_size); + else + note_data = gdbarch_make_corefile_notes (target_gdbarch (), obfd, ¬e_size); - /* Create the note section. */ - if (note_data != NULL && note_size != 0) - { - 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 ())); + if (note_data == NULL || note_size == 0) + error (_("Target does not support core file generation.")); - 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); - } + /* 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 (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 ())); - } + if (!bfd_set_section_contents (obfd, note_sec, note_data, 0, note_size)) + warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ())); } static void @@ -109,7 +112,7 @@ do_bfd_delete_cleanup (void *arg) bfd *obfd = arg; const char *filename = obfd->filename; - bfd_close (arg); + gdb_bfd_unref (arg); unlink (filename); } @@ -119,8 +122,9 @@ do_bfd_delete_cleanup (void *arg) static void gcore_command (char *args, int from_tty) { - struct cleanup *old_chain; - char *corefilename, corefilename_buffer[40]; + struct cleanup *filename_chain; + struct cleanup *bfd_chain; + char *corefilename; bfd *obfd; /* No use generating a corefile without a target process. */ @@ -128,13 +132,13 @@ gcore_command (char *args, int from_tty) noprocess (); if (args && *args) - corefilename = args; + corefilename = tilde_expand (args); 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, @@ -144,16 +148,17 @@ gcore_command (char *args, int from_tty) obfd = create_gcore_bfd (corefilename); /* Need a cleanup that will close and delete the file. */ - old_chain = make_cleanup (do_bfd_delete_cleanup, obfd); + bfd_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); + discard_cleanups (bfd_chain); + gdb_bfd_unref (obfd); - discard_cleanups (old_chain); - bfd_close (obfd); + fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename); + do_cleanups (filename_chain); } static unsigned long @@ -163,7 +168,7 @@ default_gcore_mach (void) return 0; #else - const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch); + const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch ()); if (bfdarch != NULL) return bfdarch->mach; @@ -177,7 +182,7 @@ default_gcore_mach (void) static enum bfd_architecture default_gcore_arch (void) { - const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch); + const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (target_gdbarch ()); if (bfdarch != NULL) return bfdarch->arch; @@ -191,8 +196,8 @@ static const char * default_gcore_target (void) { /* 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); + 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. */ @@ -377,9 +382,12 @@ make_output_phdrs (bfd *obfd, asection *osec, void *ignored) 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 -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; asection *osec; @@ -388,18 +396,18 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, /* 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) { fprintf_filtered (gdb_stdout, "Ignore segment, %s bytes at %s\n", - plongest (size), paddress (target_gdbarch, vaddr)); + plongest (size), paddress (target_gdbarch (), vaddr)); } return 0; } - if (write == 0 && !solib_keep_data_in_core (vaddr, size)) + 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. */ @@ -422,20 +430,22 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, 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)) { - flags &= ~SEC_LOAD; - flags |= SEC_NEVER_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 @@ -452,7 +462,7 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, if (info_verbose) { fprintf_filtered (gdb_stdout, "Save segment, %s bytes at %s\n", - plongest (size), paddress (target_gdbarch, vaddr)); + plongest (size), paddress (target_gdbarch (), vaddr)); } bfd_set_section_size (obfd, osec, size); @@ -476,6 +486,10 @@ objfile_find_memory_regions (find_memory_region_ftype func, void *obfd) asection *isec = objsec->the_bfd_section; flagword flags = bfd_get_section_flags (ibfd, isec); + /* 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); @@ -485,6 +499,7 @@ objfile_find_memory_regions (find_memory_region_ftype func, void *obfd) 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; @@ -497,14 +512,16 @@ objfile_find_memory_regions (find_memory_region_ftype func, void *obfd) 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); - /* 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. */ + 1, /* Heap section will be modified. */ obfd); return 0; @@ -538,9 +555,10 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored) if (target_read_memory (bfd_section_vma (obfd, osec) + offset, memhunk, size) != 0) { - warning (_("Memory read failed for corefile section, %s bytes at %s."), + warning (_("Memory read failed for corefile " + "section, %s bytes at %s."), plongest (size), - paddress (target_gdbarch, bfd_section_vma (obfd, osec))); + paddress (target_gdbarch (), bfd_section_vma (obfd, osec))); break; } if (!bfd_set_section_contents (obfd, osec, memhunk, offset, size)) @@ -560,8 +578,14 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored) 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);