X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgcore.c;h=efaccdc5fd976b936476d10af5093e0145ef9aa9;hb=43259571aca0944565543698d044240ecfef4689;hp=5bf09fdbe6073ff6e4a97f26e524067c3f38ce7f;hpb=d3420b2fce5ef93c51e6e88c58a0c01c3eb0c50f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gcore.c b/gdb/gcore.c index 5bf09fdbe6..efaccdc5fd 100644 --- a/gdb/gcore.c +++ b/gdb/gcore.c @@ -1,6 +1,6 @@ /* Generate a core file for the inferior process. - Copyright 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -62,13 +62,13 @@ gcore_command (char *args, int from_tty) } if (info_verbose) - fprintf_filtered (gdb_stdout, + 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); + 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); @@ -84,11 +84,11 @@ gcore_command (char *args, int from_tty) { note_sec = bfd_make_section_anyway (obfd, "note0"); 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_set_section_flags (obfd, note_sec, + 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); @@ -96,13 +96,13 @@ gcore_command (char *args, int from_tty) /* 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)) - warning ("writing note section (%s)", bfd_errmsg (bfd_get_error ())); + warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ())); } /* Succeeded. */ @@ -126,7 +126,7 @@ default_gcore_mach (void) return bfdarch->mach; #endif /* TARGET_ARCHITECTURE */ 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 */ @@ -142,7 +142,7 @@ default_gcore_arch (void) return bfdarch->arch; #endif 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); } @@ -161,7 +161,7 @@ default_gcore_target (void) and store its limits in *BOTTOM and *TOP. Return non-zero if successful. */ -static int +static int derive_stack_segment (bfd_vma *bottom, bfd_vma *top) { struct frame_info *fi, *tmp_fi; @@ -209,7 +209,7 @@ derive_stack_segment (bfd_vma *bottom, bfd_vma *top) the static data sections. Store its limits in *BOTTOM and *TOP. Return non-zero if successful. */ -static int +static int derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) { bfd_vma top_of_data_memory = 0; @@ -244,7 +244,7 @@ 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); - 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; } @@ -285,7 +285,6 @@ derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) return 0; } -/* ARGSUSED */ static void make_output_phdrs (bfd *obfd, asection *osec, void *ignored) { @@ -307,47 +306,61 @@ make_output_phdrs (bfd *obfd, asection *osec, void *ignored) bfd_record_phdr (obfd, p_type, 1, p_flags, 0, 0, 0, 0, 1, &osec); } -static asection * -make_mem_sec (bfd *obfd, bfd_vma addr, bfd_size_type size, - unsigned int flags, unsigned int alignment) +static int +gcore_create_callback (CORE_ADDR vaddr, unsigned long size, + int read, int write, int exec, void *data) { + bfd *obfd = data; asection *osec; + flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD; - osec = bfd_make_section_anyway (obfd, "load"); - if (osec == NULL) + /* 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) { - warning ("Couldn't make gcore segment: %s", - bfd_errmsg (bfd_get_error ())); - return NULL; - } + if (info_verbose) + { + fprintf_filtered (gdb_stdout, "Ignore segment, %s bytes at 0x%s\n", + paddr_d (size), paddr_nz (vaddr)); + } - if (info_verbose) - { - fprintf_filtered (gdb_stdout, "Save segment, %lld bytes at 0x%s\n", - (long long) size, paddr_nz (addr)); + return 0; } - bfd_set_section_size (obfd, osec, size); - bfd_set_section_vma (obfd, osec, addr); - bfd_section_lma (obfd, osec) = 0; /* ??? bfd_set_section_lma? */ - bfd_set_section_alignment (obfd, osec, alignment); - bfd_set_section_flags (obfd, osec, - flags | SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS); - return osec; -} - -static int -gcore_create_callback (CORE_ADDR vaddr, unsigned long size, - int read, int write, int exec, void *data) -{ - flagword flags = 0; - if (write == 0) { + /* 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 = objsec->addr & -align; + bfd_vma end = (objsec->endaddr + 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 (((vaddr >= start && vaddr + size <= end) + || (start >= vaddr && end <= vaddr + size)) + && !(bfd_get_file_flags (abfd) & BFD_IN_MEMORY)) + { + flags &= ~SEC_LOAD; + goto keep; /* break out of two nested for loops */ + } + } + + keep: flags |= SEC_READONLY; - /* Mark readonly sections as zero-sized, such that we can avoid - copying their contents. */ - size = 0; } if (exec) @@ -355,7 +368,25 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, else flags |= SEC_DATA; - return ((make_mem_sec (data, vaddr, size, flags, 0)) == NULL); + osec = bfd_make_section_anyway (obfd, "load"); + if (osec == NULL) + { + warning (_("Couldn't make gcore segment: %s"), + bfd_errmsg (bfd_get_error ())); + return 1; + } + + if (info_verbose) + { + fprintf_filtered (gdb_stdout, "Save segment, %s bytes at 0x%s\n", + paddr_d (size), paddr_nz (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_flags (obfd, osec, flags); + return 0; } static int @@ -381,7 +412,7 @@ objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long, int size = bfd_section_size (ibfd, isec); int ret; - ret = (*func) (objsec->addr, bfd_section_size (ibfd, isec), + ret = (*func) (objsec->addr, bfd_section_size (ibfd, isec), 1, /* All sections will be readable. */ (flags & SEC_READONLY) == 0, /* Writable. */ (flags & SEC_CODE) != 0, /* Executable. */ @@ -393,7 +424,7 @@ objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long, /* Make a stack segment. */ if (derive_stack_segment (&temp_bottom, &temp_top)) - (*func) (temp_bottom, temp_top - temp_bottom, + (*func) (temp_bottom, temp_top - temp_bottom, 1, /* Stack section will be readable. */ 1, /* Stack section will be writable. */ 0, /* Stack section will not be executable. */ @@ -417,9 +448,8 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored) struct cleanup *old_chain = NULL; void *memhunk; - /* Read-only sections are marked as zero-size. We don't have to - copy their contents. */ - if (size == 0) + /* 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. */ @@ -429,15 +459,15 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored) memhunk = xmalloc (size); /* ??? This is crap since xmalloc should never return NULL. */ if (memhunk == NULL) - error ("Not enough memory to create corefile."); + error (_("Not enough memory to create corefile.")); old_chain = make_cleanup (xfree, memhunk); - if (target_read_memory (bfd_section_vma (obfd, osec), + 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))); + warning (_("Memory read failed for corefile section, %s bytes at 0x%s."), + paddr_d (size), paddr (bfd_section_vma (obfd, osec))); if (!bfd_set_section_contents (obfd, osec, memhunk, 0, size)) - warning ("Failed to write corefile contents (%s).", + warning (_("Failed to write corefile contents (%s)."), bfd_errmsg (bfd_get_error ())); do_cleanups (old_chain); /* Frees MEMHUNK. */ @@ -461,10 +491,9 @@ gcore_memory_sections (bfd *obfd) 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\ -Argument is optional filename. Default filename is 'core.'."); +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);