X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgcore.c;h=1d8a63f04cf4e2b0a487c7b8af73bb9f2bc3028f;hb=192b62ce0b4bb5c61188f570e127a26d2c32f716;hp=dd945905a6d466def1f37181930cee061d6f3595;hpb=4c38e0a4fcb69f8586d8db0b9cdb8dbab5980811;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gcore.c b/gdb/gcore.c index dd945905a6..1d8a63f04c 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-2017 Free Software Foundation, Inc. This file is part of GDB. @@ -30,10 +29,12 @@ #include "completer.h" #include "gcore.h" #include "cli/cli-decode.h" -#include "gdb_assert.h" #include #include "regcache.h" #include "regset.h" +#include "gdb_bfd.h" +#include "readline/tilde.h" +#include /* 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 @@ -48,58 +49,100 @@ static int gcore_memory_sections (bfd *); /* create_gcore_bfd -- helper for gcore_command (exported). Open a new bfd core file for output, and return the handle. */ -bfd * -create_gcore_bfd (char *filename) +gdb_bfd_ref_ptr +create_gcore_bfd (const char *filename) { - bfd *obfd = bfd_openw (filename, default_gcore_target ()); - if (!obfd) + 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, bfd_core); - bfd_set_arch_mach (obfd, default_gcore_arch (), default_gcore_mach ()); + bfd_set_format (obfd.get (), bfd_core); + bfd_set_arch_mach (obfd.get (), 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. */ - +/* write_gcore_file_1 -- do the actual work of write_gcore_file. */ -void -write_gcore_file (bfd *obfd) +static void +write_gcore_file_1 (bfd *obfd) { + struct cleanup *cleanup; 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, ¬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 ())); + cleanup = make_cleanup (xfree, note_data); - 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); - } + 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 (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 ())); + + 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 { - if (!bfd_set_section_contents (obfd, note_sec, note_data, 0, note_size)) - warning (_("writing note section (%s)"), - bfd_errmsg (bfd_get_error ())); + 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. @@ -108,8 +151,9 @@ write_gcore_file (bfd *obfd) 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. */ @@ -117,33 +161,33 @@ 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, "Opening corefile '%s' for output.\n", corefilename); /* Open the output file. */ - obfd = create_gcore_bfd (corefilename); + obfd = create_gcore_bfd (corefilename).release (); - /* Need a cleanup that will close the file (FIXME: delete it?). */ - old_chain = make_cleanup_bfd_close (obfd); + /* Need a cleanup that will close and delete the file. */ + 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); - /* 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 @@ -153,7 +197,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; @@ -167,7 +211,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; @@ -181,8 +225,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. */ @@ -253,13 +297,13 @@ call_target_sbrk (int sbrk_arg) struct value *sbrk_fn, *ret; bfd_vma tmp; - if (lookup_minimal_symbol ("sbrk", NULL, NULL) != NULL) + 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) != NULL) + else if (lookup_minimal_symbol ("_sbrk", NULL, NULL).minsym != NULL) { sbrk_fn = find_function_in_inferior ("_sbrk", &sbrk_objf); if (sbrk_fn == NULL) @@ -291,7 +335,6 @@ call_target_sbrk (int sbrk_arg) static int derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) { - struct gdbarch *gdbarch; bfd_vma top_of_data_memory = 0; bfd_vma top_of_heap = 0; bfd_size_type sec_size; @@ -352,9 +395,9 @@ make_output_phdrs (bfd *obfd, asection *osec, void *ignored) int p_type = 0; /* 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; - else if (strncmp (bfd_section_name (obfd, osec), "note", 4) == 0) + else if (startswith (bfd_section_name (obfd, osec), "note")) p_type = PT_NOTE; else p_type = PT_NULL; @@ -368,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); } +/* 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; + 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. */ - 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. */ @@ -405,6 +451,7 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, asec); 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 @@ -412,20 +459,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 @@ -442,7 +491,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); @@ -451,10 +500,9 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, 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; @@ -467,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); - 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; - ret = (*func) (obj_section_addr (objsec), 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, /* MODIFIED is unknown, pass it as true. */ obfd); if (ret != 0) return ret; @@ -490,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 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; @@ -509,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; - 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. */ - if (strncmp ("load", bfd_section_name (obfd, osec), 4) != 0) + if (!startswith (bfd_section_name (obfd, osec), "load")) 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) @@ -534,9 +585,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)) @@ -556,8 +608,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); @@ -579,5 +637,4 @@ Save a core file with the current state of the debugged process.\n\ Argument is optional filename. Default filename is 'core.'.")); add_com_alias ("gcore", "generate-core-file", class_files, 1); - exec_set_find_memory_regions (objfile_find_memory_regions); }