X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgcore.c;h=f283ed4580d9f2266dafeafcd09b88eca8a311fd;hb=c0c3707ff46ccfb78ea175dd42d628d8c90dca8b;hp=d2adfc880c5d8684edbf8d72039ee472ea42433d;hpb=dccbb60975cdbcd6a906a79d0c4308b040fdac1b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gcore.c b/gdb/gcore.c index d2adfc880c..f283ed4580 100644 --- a/gdb/gcore.c +++ b/gdb/gcore.c @@ -1,6 +1,6 @@ /* Generate a core file for the inferior process. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -34,6 +34,10 @@ #include "regset.h" #include "gdb_bfd.h" #include "readline/tilde.h" +#include +#include "gdbsupport/gdb_unlinker.h" +#include "gdbsupport/byte-vector.h" +#include "gdbsupport/scope-exit.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 @@ -48,15 +52,15 @@ 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 * +gdb_bfd_ref_ptr create_gcore_bfd (const char *filename) { - bfd *obfd = gdb_bfd_openw (filename, default_gcore_target ()); + gdb_bfd_ref_ptr obfd (gdb_bfd_openw (filename, default_gcore_target ())); - if (!obfd) + 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; } @@ -65,8 +69,7 @@ create_gcore_bfd (const char *filename) static void write_gcore_file_1 (bfd *obfd) { - struct cleanup *cleanup; - void *note_data = NULL; + gdb::unique_xmalloc_ptr note_data; int note_size = 0; asection *note_sec = NULL; @@ -75,11 +78,10 @@ write_gcore_file_1 (bfd *obfd) 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); + note_data.reset (target_make_corefile_notes (obfd, ¬e_size)); else - note_data = gdbarch_make_corefile_notes (target_gdbarch (), obfd, ¬e_size); - - cleanup = make_cleanup (xfree, note_data); + note_data.reset (gdbarch_make_corefile_notes (target_gdbarch (), obfd, + ¬e_size)); if (note_data == NULL || note_size == 0) error (_("Target does not support core file generation.")); @@ -93,19 +95,18 @@ write_gcore_file_1 (bfd *obfd) 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); + bfd_set_section_vma (note_sec, 0); + bfd_set_section_alignment (note_sec, 0); + bfd_set_section_size (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)) + if (!bfd_set_section_contents (obfd, note_sec, note_data.get (), 0, + note_size)) warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ())); - - do_cleanups (cleanup); } /* write_gcore_file -- helper for gcore_command (exported). @@ -114,72 +115,49 @@ write_gcore_file_1 (bfd *obfd) void write_gcore_file (bfd *obfd) { - volatile struct gdb_exception except; - target_prepare_to_generate_core (); - - TRY_CATCH (except, RETURN_MASK_ALL) - write_gcore_file_1 (obfd); - - target_done_generating_core (); - - if (except.reason < 0) - throw_exception (except); -} - -static void -do_bfd_delete_cleanup (void *arg) -{ - bfd *obfd = arg; - const char *filename = obfd->filename; - - gdb_bfd_unref (arg); - unlink (filename); + SCOPE_EXIT { target_done_generating_core (); }; + write_gcore_file_1 (obfd); } /* gcore_command -- implements the 'gcore' command. Generate a core file from the inferior process. */ static void -gcore_command (char *args, int from_tty) +gcore_command (const char *args, int from_tty) { - struct cleanup *filename_chain; - struct cleanup *bfd_chain; - char *corefilename; - bfd *obfd; + gdb::unique_xmalloc_ptr corefilename; /* No use generating a corefile without a target process. */ if (!target_has_execution) noprocess (); if (args && *args) - corefilename = tilde_expand (args); + corefilename.reset (tilde_expand (args)); else { /* Default corefile name is "core.PID". */ - corefilename = xstrprintf ("core.%d", ptid_get_pid (inferior_ptid)); + corefilename.reset (xstrprintf ("core.%d", inferior_ptid.pid ())); } - filename_chain = make_cleanup (xfree, corefilename); if (info_verbose) fprintf_filtered (gdb_stdout, - "Opening corefile '%s' for output.\n", corefilename); + "Opening corefile '%s' for output.\n", + corefilename.get ()); /* Open the output file. */ - obfd = create_gcore_bfd (corefilename); + gdb_bfd_ref_ptr obfd (create_gcore_bfd (corefilename.get ())); - /* Need a cleanup that will close and delete the file. */ - bfd_chain = make_cleanup (do_bfd_delete_cleanup, obfd); + /* Arrange to unlink the file on failure. */ + gdb::unlinker unlink_file (corefilename.get ()); /* Call worker function. */ - write_gcore_file (obfd); + write_gcore_file (obfd.get ()); /* Succeeded. */ - discard_cleanups (bfd_chain); - gdb_bfd_unref (obfd); + unlink_file.keep (); - fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename); - do_cleanups (filename_chain); + fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename.get ()); } static unsigned long @@ -308,7 +286,7 @@ call_target_sbrk (int sbrk_arg) 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); + ret = call_function_by_hand (sbrk_fn, NULL, target_sbrk_arg); if (ret == NULL) return (bfd_vma) 0; @@ -354,11 +332,11 @@ derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) for (sec = abfd->sections; sec; sec = sec->next) { - if (bfd_get_section_flags (abfd, sec) & SEC_DATA - || strcmp (".bss", bfd_section_name (abfd, sec)) == 0) + if (bfd_section_flags (sec) & SEC_DATA + || strcmp (".bss", bfd_section_name (sec)) == 0) { - sec_vaddr = bfd_get_section_vma (abfd, sec); - sec_size = bfd_get_section_size (sec); + sec_vaddr = bfd_section_vma (sec); + sec_size = bfd_section_size (sec); if (sec_vaddr + sec_size > top_of_data_memory) top_of_data_memory = sec_vaddr + sec_size; } @@ -387,17 +365,17 @@ 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 (osec), "load")) p_type = PT_LOAD; - else if (strncmp (bfd_section_name (obfd, osec), "note", 4) == 0) + else if (startswith (bfd_section_name (osec), "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)) + if (!(bfd_section_flags (osec) & SEC_READONLY)) p_flags |= PF_W; /* Segment is writable. */ - if (bfd_get_section_flags (obfd, osec) & SEC_CODE) + if (bfd_section_flags (osec) & SEC_CODE) p_flags |= PF_X; /* Segment is executable. */ bfd_record_phdr (obfd, p_type, 1, p_flags, 0, 0, 0, 0, 1, &osec); @@ -410,7 +388,7 @@ static int 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; @@ -432,34 +410,33 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read, { /* 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. */ - struct objfile *objfile; struct obj_section *objsec; - ALL_OBJSECTIONS (objfile, objsec) - { - bfd *abfd = objfile->obfd; - asection *asec = objsec->the_bfd_section; - bfd_vma align = (bfd_vma) 1 << bfd_get_section_alignment (abfd, - 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 - (i.e. a mapping covering multiple small sections). - - This BFD was synthesized from reading target memory, - we don't want to omit that. */ - 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 | SEC_HAS_CONTENTS); - goto keep; /* Break out of two nested for loops. */ - } - } + for (objfile *objfile : current_program_space->objfiles ()) + ALL_OBJFILE_OSECTIONS (objfile, objsec) + { + bfd *abfd = objfile->obfd; + asection *asec = objsec->the_bfd_section; + bfd_vma align = (bfd_vma) 1 << bfd_section_alignment (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 + (i.e. a mapping covering multiple small sections). + + This BFD was synthesized from reading target memory, + we don't want to omit that. */ + 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 | SEC_HAS_CONTENTS); + goto keep; /* Break out of two nested for loops. */ + } + } keep:; } @@ -486,9 +463,9 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read, 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 (osec, size); + bfd_set_section_vma (osec, vaddr); + bfd_set_section_lma (osec, 0); return 0; } @@ -497,36 +474,35 @@ 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; struct obj_section *objsec; bfd_vma temp_bottom, temp_top; /* Call callback function for each objfile section. */ - ALL_OBJSECTIONS (objfile, objsec) - { - bfd *ibfd = objfile->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); - int ret; - - 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; - } - } + for (objfile *objfile : current_program_space->objfiles ()) + ALL_OBJFILE_OSECTIONS (objfile, objsec) + { + asection *isec = objsec->the_bfd_section; + flagword flags = bfd_section_flags (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 (isec); + int ret; + + 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; + } + } /* Make a stack segment. */ if (derive_stack_segment (&temp_bottom, &temp_top)) @@ -552,38 +528,36 @@ objfile_find_memory_regions (struct target_ops *self, static void gcore_copy_callback (bfd *obfd, asection *osec, void *ignored) { - bfd_size_type size, total_size = bfd_section_size (obfd, osec); + bfd_size_type size, total_size = bfd_section_size (osec); file_ptr offset = 0; - struct cleanup *old_chain = NULL; - void *memhunk; /* Read-only sections are marked; we don't have to copy their contents. */ - if ((bfd_get_section_flags (obfd, osec) & SEC_LOAD) == 0) + if ((bfd_section_flags (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 (osec), "load")) return; - size = min (total_size, MAX_COPY_BYTES); - memhunk = xmalloc (size); - old_chain = make_cleanup (xfree, memhunk); + size = std::min (total_size, (bfd_size_type) MAX_COPY_BYTES); + gdb::byte_vector memhunk (size); while (total_size > 0) { if (size > total_size) size = total_size; - if (target_read_memory (bfd_section_vma (obfd, osec) + offset, - memhunk, size) != 0) + if (target_read_memory (bfd_section_vma (osec) + offset, + memhunk.data (), size) != 0) { 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 (osec))); break; } - if (!bfd_set_section_contents (obfd, osec, memhunk, offset, size)) + if (!bfd_set_section_contents (obfd, osec, memhunk.data (), + offset, size)) { warning (_("Failed to write corefile contents (%s)."), bfd_errmsg (bfd_get_error ())); @@ -593,8 +567,6 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored) total_size -= size; offset += size; } - - do_cleanups (old_chain); /* Frees MEMHUNK. */ } static int @@ -618,15 +590,13 @@ gcore_memory_sections (bfd *obfd) return 1; } -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_gcore; - void _initialize_gcore (void) { add_com ("generate-core-file", class_files, gcore_command, _("\ Save a core file with the current state of the debugged process.\n\ -Argument is optional filename. Default filename is 'core.'.")); +Usage: generate-core-file [FILENAME]\n\ +Argument is optional filename. Default filename is 'core.PROCESS_ID'.")); add_com_alias ("gcore", "generate-core-file", class_files, 1); }