X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fexec.c;h=c998ab19bd241bbf89a9bc8d607c7c4452b4b261;hb=7674d381b47f9f2411c0ca1da0c152940dc0d7bd;hp=a2da9d5297c1e49e338878e995ca6493fbc54a86;hpb=0ba1096ad5c3a2dc64e6f30c122e7d9c205eef90;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/exec.c b/gdb/exec.c index a2da9d5297..c998ab19bd 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -1,8 +1,6 @@ /* Work with executable files, for GDB. - Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 1988-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -35,19 +33,16 @@ #include "arch-utils.h" #include "gdbthread.h" #include "progspace.h" +#include "gdb_bfd.h" +#include "gcore.h" #include #include "readline/readline.h" -#include "gdb_string.h" - #include "gdbcore.h" #include -#include "gdb_stat.h" - -#include "xcoffsolib.h" - -struct vmap *map_vmap (bfd *, bfd *); +#include +#include "solist.h" void (*deprecated_file_changed_hook) (char *); @@ -65,10 +60,7 @@ void _initialize_exec (void); /* The target vector for executable files. */ -struct target_ops exec_ops; - -/* True if the exec target is pushed on the stack. */ -static int using_exec_ops; +static struct target_ops exec_ops; /* Whether to open exec and core files read-only or read-write. */ @@ -82,10 +74,8 @@ show_write_files (struct ui_file *file, int from_tty, } -struct vmap *vmap; - static void -exec_open (char *args, int from_tty) +exec_open (const char *args, int from_tty) { target_preopen (from_tty); exec_file_attach (args, from_tty); @@ -100,17 +90,18 @@ exec_close (void) if (exec_bfd) { bfd *abfd = exec_bfd; - char *name = bfd_get_filename (abfd); - gdb_bfd_close_or_warn (abfd); - xfree (name); + gdb_bfd_unref (abfd); /* Removing target sections may close the exec_ops target. Clear exec_bfd before doing so to prevent recursion. */ exec_bfd = NULL; exec_bfd_mtime = 0; - remove_target_sections (abfd); + remove_target_sections (&exec_bfd); + + xfree (exec_filename); + exec_filename = NULL; } } @@ -118,64 +109,139 @@ exec_close (void) sections and closes all executable bfds from all program spaces. */ static void -exec_close_1 (int quitting) +exec_close_1 (struct target_ops *self) { - int need_symtab_cleanup = 0; - struct vmap *vp, *nxt; + struct program_space *ss; + struct cleanup *old_chain; - using_exec_ops = 0; + old_chain = save_current_program_space (); + ALL_PSPACES (ss) + { + set_current_program_space (ss); + clear_section_table (current_target_sections); + exec_close (); + } - for (nxt = vmap; nxt != NULL;) - { - vp = nxt; - nxt = vp->nxt; + do_cleanups (old_chain); +} - /* if there is an objfile associated with this bfd, - free_objfile() will do proper cleanup of objfile *and* bfd. */ +void +exec_file_clear (int from_tty) +{ + /* Remove exec file. */ + exec_close (); - if (vp->objfile) - { - free_objfile (vp->objfile); - need_symtab_cleanup = 1; - } - else if (vp->bfd != exec_bfd) - /* FIXME-leak: We should be freeing vp->name too, I think. */ - gdb_bfd_close_or_warn (vp->bfd); + if (from_tty) + printf_unfiltered (_("No executable file now.\n")); +} - xfree (vp); - } +/* Returns non-zero if exceptions E1 and E2 are equal. Returns zero + otherwise. */ - vmap = NULL; +static int +exception_print_same (struct gdb_exception e1, struct gdb_exception e2) +{ + const char *msg1 = e1.message; + const char *msg2 = e2.message; - { - struct program_space *ss; - struct cleanup *old_chain; + if (msg1 == NULL) + msg1 = ""; + if (msg2 == NULL) + msg2 = ""; - old_chain = save_current_program_space (); - ALL_PSPACES (ss) + return (e1.reason == e2.reason + && e1.error == e2.error + && strcmp (e1.message, e2.message) == 0); +} + +/* See gdbcore.h. */ + +void +exec_file_locate_attach (int pid, int from_tty) +{ + char *exec_file, *full_exec_path = NULL; + struct cleanup *old_chain; + struct gdb_exception prev_err = exception_none; + + /* Do nothing if we already have an executable filename. */ + exec_file = (char *) get_exec_file (0); + if (exec_file != NULL) + return; + + /* Try to determine a filename from the process itself. */ + exec_file = target_pid_to_exec_file (pid); + if (exec_file == NULL) { - set_current_program_space (ss); + warning (_("No executable has been specified and target does not " + "support\n" + "determining executable automatically. " + "Try using the \"file\" command.")); + return; + } - /* Delete all target sections. */ - resize_section_table - (current_target_sections, - -resize_section_table (current_target_sections, 0)); + /* If gdb_sysroot is not empty and the discovered filename + is absolute then prefix the filename with gdb_sysroot. */ + if (*gdb_sysroot != '\0' && IS_ABSOLUTE_PATH (exec_file)) + { + full_exec_path = exec_file_find (exec_file, NULL); + if (full_exec_path == NULL) + return; + } + else + { + /* It's possible we don't have a full path, but rather just a + filename. Some targets, such as HP-UX, don't provide the + full path, sigh. + + Attempt to qualify the filename against the source path. + (If that fails, we'll just fall back on the original + filename. Not much more we can do...) */ + if (!source_full_path_of (exec_file, &full_exec_path)) + full_exec_path = xstrdup (exec_file); + } + + old_chain = make_cleanup (xfree, full_exec_path); + make_cleanup (free_current_contents, &prev_err.message); - exec_close (); + /* exec_file_attach and symbol_file_add_main may throw an error if the file + cannot be opened either locally or remotely. + + This happens for example, when the file is first found in the local + sysroot (above), and then disappears (a TOCTOU race), or when it doesn't + exist in the target filesystem, or when the file does exist, but + is not readable. + + Even without a symbol file, the remote-based debugging session should + continue normally instead of ending abruptly. Hence we catch thrown + errors/exceptions in the following code. */ + TRY + { + exec_file_attach (full_exec_path, from_tty); } + CATCH (err, RETURN_MASK_ERROR) + { + if (err.message != NULL) + warning ("%s", err.message); - do_cleanups (old_chain); - } -} + prev_err = err; -void -exec_file_clear (int from_tty) -{ - /* Remove exec file. */ - exec_close (); + /* Save message so it doesn't get trashed by the catch below. */ + prev_err.message = xstrdup (err.message); + } + END_CATCH - if (from_tty) - printf_unfiltered (_("No executable file now.\n")); + TRY + { + symbol_file_add_main (full_exec_path, from_tty); + } + CATCH (err, RETURN_MASK_ERROR) + { + if (!exception_print_same (prev_err, err)) + warning ("%s", err.message); + } + END_CATCH + + do_cleanups (old_chain); } /* Set FILENAME as the new exec file. @@ -196,8 +262,16 @@ exec_file_clear (int from_tty) we're supplying the exec pathname late for good reason.) */ void -exec_file_attach (char *filename, int from_tty) +exec_file_attach (const char *filename, int from_tty) { + struct cleanup *cleanups; + + /* First, acquire a reference to the current exec_bfd. We release + this at the end of the function; but acquiring it now lets the + BFD cache return it if this call refers to the same file. */ + gdb_bfd_ref (exec_bfd); + cleanups = make_cleanup_bfd_unref (exec_bfd); + /* Remove any previous exec file. */ exec_close (); @@ -212,45 +286,84 @@ exec_file_attach (char *filename, int from_tty) } else { - struct cleanup *cleanups; - char *scratch_pathname; + int load_via_target = 0; + char *scratch_pathname, *canonical_pathname; int scratch_chan; struct target_section *sections = NULL, *sections_end = NULL; char **matching; - scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, filename, - write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY, - &scratch_pathname); -#if defined(__GO32__) || defined(_WIN32) || defined(__CYGWIN__) - if (scratch_chan < 0) + if (is_target_filename (filename)) + { + if (target_filesystem_is_local ()) + filename += strlen (TARGET_SYSROOT_PREFIX); + else + load_via_target = 1; + } + + if (load_via_target) { - char *exename = alloca (strlen (filename) + 5); + /* gdb_bfd_fopen does not support "target:" filenames. */ + if (write_files) + warning (_("writing into executable files is " + "not supported for %s sysroots"), + TARGET_SYSROOT_PREFIX); + + scratch_pathname = xstrdup (filename); + make_cleanup (xfree, scratch_pathname); + + scratch_chan = -1; - strcat (strcpy (exename, filename), ".exe"); - scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, exename, - write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY, - &scratch_pathname); + canonical_pathname = scratch_pathname; } + else + { + scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, + filename, write_files ? + O_RDWR | O_BINARY : O_RDONLY | O_BINARY, + &scratch_pathname); +#if defined(__GO32__) || defined(_WIN32) || defined(__CYGWIN__) + if (scratch_chan < 0) + { + char *exename = (char *) alloca (strlen (filename) + 5); + + strcat (strcpy (exename, filename), ".exe"); + scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, + exename, write_files ? + O_RDWR | O_BINARY + : O_RDONLY | O_BINARY, + &scratch_pathname); + } #endif - if (scratch_chan < 0) - perror_with_name (filename); - exec_bfd = bfd_fopen (scratch_pathname, gnutarget, - write_files ? FOPEN_RUB : FOPEN_RB, - scratch_chan); + if (scratch_chan < 0) + perror_with_name (filename); + + make_cleanup (xfree, scratch_pathname); + + /* gdb_bfd_open (and its variants) prefers canonicalized + pathname for better BFD caching. */ + canonical_pathname = gdb_realpath (scratch_pathname); + make_cleanup (xfree, canonical_pathname); + } + + if (write_files && !load_via_target) + exec_bfd = gdb_bfd_fopen (canonical_pathname, gnutarget, + FOPEN_RUB, scratch_chan); + else + exec_bfd = gdb_bfd_open (canonical_pathname, gnutarget, scratch_chan); if (!exec_bfd) { - close (scratch_chan); - error (_("\"%s\": could not open as an executable file: %s"), + error (_("\"%s\": could not open as an executable file: %s."), scratch_pathname, bfd_errmsg (bfd_get_error ())); } - /* At this point, scratch_pathname and exec_bfd->name both point to the - same malloc'd string. However exec_close() will attempt to free it - via the exec_bfd->name pointer, so we need to make another copy and - leave exec_bfd as the new owner of the original copy. */ - scratch_pathname = xstrdup (scratch_pathname); - cleanups = make_cleanup (xfree, scratch_pathname); + /* gdb_realpath_keepfile resolves symlinks on the local + filesystem and so cannot be used for "target:" files. */ + gdb_assert (exec_filename == NULL); + if (load_via_target) + exec_filename = xstrdup (bfd_get_filename (exec_bfd)); + else + exec_filename = gdb_realpath_keepfile (scratch_pathname); if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching)) { @@ -262,22 +375,6 @@ exec_file_attach (char *filename, int from_tty) gdb_bfd_errmsg (bfd_get_error (), matching)); } - /* FIXME - This should only be run for RS6000, but the ifdef is a poor - way to accomplish. */ -#ifdef DEPRECATED_IBM6000_TARGET - /* Setup initial vmap. */ - - map_vmap (exec_bfd, 0); - if (vmap == NULL) - { - /* Make sure to close exec_bfd, or else "run" might try to use - it. */ - exec_close (); - error (_("\"%s\": can't find the file sections: %s"), - scratch_pathname, bfd_errmsg (bfd_get_error ())); - } -#endif /* DEPRECATED_IBM6000_TARGET */ - if (build_section_table (exec_bfd, §ions, §ions_end)) { /* Make sure to close exec_bfd, or else "run" might try to use @@ -296,15 +393,16 @@ exec_file_attach (char *filename, int from_tty) /* Add the executable's sections to the current address spaces' list of sections. This possibly pushes the exec_ops target. */ - add_target_sections (sections, sections_end); + add_target_sections (&exec_bfd, sections, sections_end); xfree (sections); /* Tell display code (if any) about the changed file name. */ if (deprecated_exec_file_display_hook) (*deprecated_exec_file_display_hook) (filename); - - do_cleanups (cleanups); } + + do_cleanups (cleanups); + bfd_cache_close_all (); observer_notify_executable_changed (); } @@ -381,6 +479,8 @@ add_to_section_table (bfd *abfd, struct bfd_section *asect, struct target_section **table_pp = (struct target_section **) table_pp_char; flagword aflag; + gdb_assert (abfd == asect->owner); + /* Check the section flags, but do not discard zero-length sections, since some symbols may still be attached to this section. For instance, we encountered on sparc-solaris 2.10 a shared library with an empty .bss @@ -390,36 +490,45 @@ add_to_section_table (bfd *abfd, struct bfd_section *asect, if (!(aflag & SEC_ALLOC)) return; - (*table_pp)->bfd = abfd; + (*table_pp)->owner = NULL; (*table_pp)->the_bfd_section = asect; (*table_pp)->addr = bfd_section_vma (abfd, asect); (*table_pp)->endaddr = (*table_pp)->addr + bfd_section_size (abfd, asect); (*table_pp)++; } -int -resize_section_table (struct target_section_table *table, int num_added) +/* See exec.h. */ + +void +clear_section_table (struct target_section_table *table) +{ + xfree (table->sections); + table->sections = table->sections_end = NULL; +} + +/* Resize section table TABLE by ADJUSTMENT. + ADJUSTMENT may be negative, in which case the caller must have already + removed the sections being deleted. + Returns the old size. */ + +static int +resize_section_table (struct target_section_table *table, int adjustment) { - struct target_section *old_value; int old_count; int new_count; - old_value = table->sections; old_count = table->sections_end - table->sections; - new_count = num_added + old_count; + new_count = adjustment + old_count; if (new_count) { - table->sections = xrealloc (table->sections, - sizeof (struct target_section) * new_count); + table->sections = XRESIZEVEC (struct target_section, table->sections, + new_count); table->sections_end = table->sections + new_count; } else - { - xfree (table->sections); - table->sections = table->sections_end = NULL; - } + clear_section_table (table); return old_count; } @@ -436,7 +545,7 @@ build_section_table (struct bfd *some_bfd, struct target_section **start, count = bfd_count_sections (some_bfd); if (*start) xfree (* start); - *start = (struct target_section *) xmalloc (count * sizeof (**start)); + *start = XNEWVEC (struct target_section, count); *end = *start; bfd_map_over_sections (some_bfd, add_to_section_table, (char *) end); if (*end > *start + count) @@ -450,7 +559,8 @@ build_section_table (struct bfd *some_bfd, struct target_section **start, current set of target sections. */ void -add_target_sections (struct target_section *sections, +add_target_sections (void *owner, + struct target_section *sections, struct target_section *sections_end) { int count; @@ -461,31 +571,80 @@ add_target_sections (struct target_section *sections, if (count > 0) { int space = resize_section_table (table, count); + int i; - memcpy (table->sections + space, - sections, count * sizeof (sections[0])); + for (i = 0; i < count; ++i) + { + table->sections[space + i] = sections[i]; + table->sections[space + i].owner = owner; + } /* If these are the first file sections we can provide memory from, push the file_stratum target. */ - if (!using_exec_ops) - { - using_exec_ops = 1; - push_target (&exec_ops); - } + if (!target_is_pushed (&exec_ops)) + push_target (&exec_ops); } } -/* Remove all target sections taken from ABFD. */ +/* Add the sections of OBJFILE to the current set of target sections. */ void -remove_target_sections (bfd *abfd) +add_target_sections_of_objfile (struct objfile *objfile) +{ + struct target_section_table *table = current_target_sections; + struct obj_section *osect; + int space; + unsigned count = 0; + struct target_section *ts; + + if (objfile == NULL) + return; + + /* Compute the number of sections to add. */ + ALL_OBJFILE_OSECTIONS (objfile, osect) + { + if (bfd_get_section_size (osect->the_bfd_section) == 0) + continue; + count++; + } + + if (count == 0) + return; + + space = resize_section_table (table, count); + + ts = table->sections + space; + + ALL_OBJFILE_OSECTIONS (objfile, osect) + { + if (bfd_get_section_size (osect->the_bfd_section) == 0) + continue; + + gdb_assert (ts < table->sections + space + count); + + ts->addr = obj_section_addr (osect); + ts->endaddr = obj_section_endaddr (osect); + ts->the_bfd_section = osect->the_bfd_section; + ts->owner = (void *) objfile; + + ts++; + } +} + +/* Remove all target sections owned by OWNER. + OWNER must be the same value passed to add_target_sections. */ + +void +remove_target_sections (void *owner) { struct target_section *src, *dest; struct target_section_table *table = current_target_sections; + gdb_assert (owner != NULL); + dest = table->sections; for (src = table->sections; src < table->sections_end; src++) - if (src->bfd != abfd) + if (src->owner != owner) { /* Keep this section. */ if (dest < src) @@ -517,63 +676,60 @@ remove_target_sections (bfd *abfd) } -static void -bfdsec_to_vmap (struct bfd *abfd, struct bfd_section *sect, void *arg3) -{ - struct vmap_and_bfd *vmap_bfd = (struct vmap_and_bfd *) arg3; - struct vmap *vp; - vp = vmap_bfd->pvmap; - - if ((bfd_get_section_flags (abfd, sect) & SEC_LOAD) == 0) - return; - - if (strcmp (bfd_section_name (abfd, sect), ".text") == 0) - { - vp->tstart = bfd_section_vma (abfd, sect); - vp->tend = vp->tstart + bfd_section_size (abfd, sect); - vp->tvma = bfd_section_vma (abfd, sect); - vp->toffs = sect->filepos; - } - else if (strcmp (bfd_section_name (abfd, sect), ".data") == 0) +enum target_xfer_status +exec_read_partial_read_only (gdb_byte *readbuf, ULONGEST offset, + ULONGEST len, ULONGEST *xfered_len) +{ + /* It's unduly pedantic to refuse to look at the executable for + read-only pieces; so do the equivalent of readonly regions aka + QTro packet. */ + if (exec_bfd != NULL) { - vp->dstart = bfd_section_vma (abfd, sect); - vp->dend = vp->dstart + bfd_section_size (abfd, sect); - vp->dvma = bfd_section_vma (abfd, sect); - } - /* Silently ignore other types of sections. (FIXME?) */ -} + asection *s; + bfd_size_type size; + bfd_vma vma; -/* Make a vmap for ABFD which might be a member of the archive ARCH. - Return the new vmap. */ + for (s = exec_bfd->sections; s; s = s->next) + { + if ((s->flags & SEC_LOAD) == 0 + || (s->flags & SEC_READONLY) == 0) + continue; -struct vmap * -map_vmap (bfd *abfd, bfd *arch) -{ - struct vmap_and_bfd vmap_bfd; - struct vmap *vp, **vpp; + vma = s->vma; + size = bfd_get_section_size (s); + if (vma <= offset && offset < (vma + size)) + { + ULONGEST amt; - vp = (struct vmap *) xmalloc (sizeof (*vp)); - memset ((char *) vp, '\0', sizeof (*vp)); - vp->nxt = 0; - vp->bfd = abfd; - vp->name = bfd_get_filename (arch ? arch : abfd); - vp->member = arch ? bfd_get_filename (abfd) : ""; + amt = (vma + size) - offset; + if (amt > len) + amt = len; - vmap_bfd.pbfd = arch; - vmap_bfd.pvmap = vp; - bfd_map_over_sections (abfd, bfdsec_to_vmap, &vmap_bfd); + amt = bfd_get_section_contents (exec_bfd, s, + readbuf, offset - vma, amt); - /* Find the end of the list and append. */ - for (vpp = &vmap; *vpp; vpp = &(*vpp)->nxt) - ; - *vpp = vp; + if (amt == 0) + return TARGET_XFER_EOF; + else + { + *xfered_len = amt; + return TARGET_XFER_OK; + } + } + } + } - return vp; + /* Indicate failure to find the requested memory block. */ + return TARGET_XFER_E_IO; } - -VEC(mem_range_s) * +/* Appends all read-only memory ranges found in the target section + table defined by SECTIONS and SECTIONS_END, starting at (and + intersected with) MEMADDR for LEN bytes. Returns the augmented + VEC. */ + +static VEC(mem_range_s) * section_table_available_memory (VEC(mem_range_s) *memory, CORE_ADDR memaddr, ULONGEST len, struct target_section *sections, @@ -583,7 +739,8 @@ section_table_available_memory (VEC(mem_range_s) *memory, for (p = sections; p < sections_end; p++) { - if ((bfd_get_section_flags (p->bfd, p->the_bfd_section) + if ((bfd_get_section_flags (p->the_bfd_section->owner, + p->the_bfd_section) & SEC_READONLY) == 0) continue; @@ -609,9 +766,64 @@ section_table_available_memory (VEC(mem_range_s) *memory, return memory; } -int +enum target_xfer_status +section_table_read_available_memory (gdb_byte *readbuf, ULONGEST offset, + ULONGEST len, ULONGEST *xfered_len) +{ + VEC(mem_range_s) *available_memory = NULL; + struct target_section_table *table; + struct cleanup *old_chain; + mem_range_s *r; + int i; + + table = target_get_section_table (&exec_ops); + available_memory = section_table_available_memory (available_memory, + offset, len, + table->sections, + table->sections_end); + + old_chain = make_cleanup (VEC_cleanup(mem_range_s), + &available_memory); + + normalize_mem_ranges (available_memory); + + for (i = 0; + VEC_iterate (mem_range_s, available_memory, i, r); + i++) + { + if (mem_ranges_overlap (r->start, r->length, offset, len)) + { + CORE_ADDR end; + enum target_xfer_status status; + + /* Get the intersection window. */ + end = min (offset + len, r->start + r->length); + + gdb_assert (end - offset <= len); + + if (offset >= r->start) + status = exec_read_partial_read_only (readbuf, offset, + end - offset, + xfered_len); + else + { + *xfered_len = r->start - offset; + status = TARGET_XFER_UNAVAILABLE; + } + do_cleanups (old_chain); + return status; + } + } + do_cleanups (old_chain); + + *xfered_len = len; + return TARGET_XFER_UNAVAILABLE; +} + +enum target_xfer_status section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf, - ULONGEST offset, LONGEST len, + ULONGEST offset, ULONGEST len, + ULONGEST *xfered_len, struct target_section *sections, struct target_section *sections_end, const char *section_name) @@ -621,13 +833,16 @@ section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST memaddr = offset; ULONGEST memend = memaddr + len; - if (len <= 0) + if (len == 0) internal_error (__FILE__, __LINE__, _("failed internal consistency check")); for (p = sections; p < sections_end; p++) { - if (section_name && strcmp (section_name, p->the_bfd_section->name) != 0) + struct bfd_section *asect = p->the_bfd_section; + bfd *abfd = asect->owner; + + if (section_name && strcmp (section_name, asect->name) != 0) continue; /* not the section we need. */ if (memaddr >= p->addr) { @@ -635,14 +850,21 @@ section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf, { /* Entire transfer is within this section. */ if (writebuf) - res = bfd_set_section_contents (p->bfd, p->the_bfd_section, + res = bfd_set_section_contents (abfd, asect, writebuf, memaddr - p->addr, len); else - res = bfd_get_section_contents (p->bfd, p->the_bfd_section, + res = bfd_get_section_contents (abfd, asect, readbuf, memaddr - p->addr, len); - return (res != 0) ? len : 0; + + if (res != 0) + { + *xfered_len = len; + return TARGET_XFER_OK; + } + else + return TARGET_XFER_EOF; } else if (memaddr >= p->endaddr) { @@ -654,43 +876,49 @@ section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf, /* This section overlaps the transfer. Just do half. */ len = p->endaddr - memaddr; if (writebuf) - res = bfd_set_section_contents (p->bfd, p->the_bfd_section, + res = bfd_set_section_contents (abfd, asect, writebuf, memaddr - p->addr, len); else - res = bfd_get_section_contents (p->bfd, p->the_bfd_section, + res = bfd_get_section_contents (abfd, asect, readbuf, memaddr - p->addr, len); - return (res != 0) ? len : 0; + if (res != 0) + { + *xfered_len = len; + return TARGET_XFER_OK; + } + else + return TARGET_XFER_EOF; } } } - return 0; /* We can't help. */ + return TARGET_XFER_EOF; /* We can't help. */ } -struct target_section_table * +static struct target_section_table * exec_get_section_table (struct target_ops *ops) { return current_target_sections; } -static LONGEST +static enum target_xfer_status exec_xfer_partial (struct target_ops *ops, enum target_object object, const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, - ULONGEST offset, LONGEST len) + ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { struct target_section_table *table = target_get_section_table (ops); if (object == TARGET_OBJECT_MEMORY) return section_table_xfer_memory_partial (readbuf, writebuf, - offset, len, + offset, len, xfered_len, table->sections, table->sections_end, NULL); else - return -1; + return TARGET_XFER_E_IO; } @@ -714,17 +942,18 @@ print_section_info (struct target_section_table *t, bfd *abfd) for (p = t->sections; p < t->sections_end; p++) { - asection *asect = p->the_bfd_section; + struct bfd_section *psect = p->the_bfd_section; + bfd *pbfd = psect->owner; - if ((bfd_get_section_flags (abfd, asect) & (SEC_ALLOC | SEC_LOAD)) + if ((bfd_get_section_flags (pbfd, psect) & (SEC_ALLOC | SEC_LOAD)) != (SEC_ALLOC | SEC_LOAD)) continue; - if (bfd_get_section_vma (abfd, asect) <= abfd->start_address - && abfd->start_address < (bfd_get_section_vma (abfd, asect) - + bfd_get_section_size (asect))) + if (bfd_get_section_vma (pbfd, psect) <= abfd->start_address + && abfd->start_address < (bfd_get_section_vma (pbfd, psect) + + bfd_get_section_size (psect))) { - displacement = p->addr - bfd_get_section_vma (abfd, asect); + displacement = p->addr - bfd_get_section_vma (pbfd, psect); break; } } @@ -740,6 +969,9 @@ print_section_info (struct target_section_table *t, bfd *abfd) } for (p = t->sections; p < t->sections_end; p++) { + struct bfd_section *psect = p->the_bfd_section; + bfd *pbfd = psect->owner; + printf_filtered ("\t%s", hex_string_custom (p->addr, wid)); printf_filtered (" - %s", hex_string_custom (p->endaddr, wid)); @@ -751,11 +983,10 @@ print_section_info (struct target_section_table *t, bfd *abfd) /* FIXME: i18n: Need to rewrite this sentence. */ if (info_verbose) printf_filtered (" @ %s", - hex_string_custom (p->the_bfd_section->filepos, 8)); - printf_filtered (" is %s", bfd_section_name (p->bfd, - p->the_bfd_section)); - if (p->bfd != abfd) - printf_filtered (" in %s", bfd_get_filename (p->bfd)); + hex_string_custom (psect->filepos, 8)); + printf_filtered (" is %s", bfd_section_name (pbfd, psect)); + if (pbfd != abfd) + printf_filtered (" in %s", bfd_get_filename (pbfd)); printf_filtered ("\n"); } } @@ -763,32 +994,10 @@ print_section_info (struct target_section_table *t, bfd *abfd) static void exec_files_info (struct target_ops *t) { - print_section_info (current_target_sections, exec_bfd); - - if (vmap) - { - int addr_size = gdbarch_addr_bit (target_gdbarch) / 8; - struct vmap *vp; - - printf_unfiltered (_("\tMapping info for file `%s'.\n"), vmap->name); - printf_unfiltered ("\t %*s %*s %*s %*s %8.8s %s\n", - addr_size * 2, "tstart", - addr_size * 2, "tend", - addr_size * 2, "dstart", - addr_size * 2, "dend", - "section", - "file(member)"); - - for (vp = vmap; vp; vp = vp->nxt) - printf_unfiltered ("\t0x%s 0x%s 0x%s 0x%s %s%s%s%s\n", - phex (vp->tstart, addr_size), - phex (vp->tend, addr_size), - phex (vp->dstart, addr_size), - phex (vp->dend, addr_size), - vp->name, - *vp->member ? "(" : "", vp->member, - *vp->member ? ")" : ""); - } + if (exec_bfd) + print_section_info (current_target_sections, exec_bfd); + else + puts_filtered (_("\t\n")); } static void @@ -815,9 +1024,9 @@ set_section_command (char *args, int from_tty) table = current_target_sections; for (p = table->sections; p < table->sections_end; p++) { - if (!strncmp (secname, bfd_section_name (exec_bfd, + if (!strncmp (secname, bfd_section_name (p->bfd, p->the_bfd_section), seclen) - && bfd_section_name (exec_bfd, p->the_bfd_section)[seclen] == '\0') + && bfd_section_name (p->bfd, p->the_bfd_section)[seclen] == '\0') { offset = secaddr - p->addr; p->addr += offset; @@ -846,7 +1055,7 @@ exec_set_section_address (const char *filename, int index, CORE_ADDR address) table = current_target_sections; for (p = table->sections; p < table->sections_end; p++) { - if (filename_cmp (filename, p->bfd->filename) == 0 + if (filename_cmp (filename, p->the_bfd_section->owner->filename) == 0 && index == p->the_bfd_section->index) { p->endaddr += address - p->addr; @@ -860,7 +1069,8 @@ exec_set_section_address (const char *filename, int index, CORE_ADDR address) breakpoint_init_inferior). */ static int -ignore (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) +ignore (struct target_ops *ops, struct gdbarch *gdbarch, + struct bp_target_info *bp_tgt) { return 0; } @@ -874,16 +1084,12 @@ exec_has_memory (struct target_ops *ops) != current_target_sections->sections_end); } -/* Find mapped memory. */ - -extern void -exec_set_find_memory_regions (int (*func) (find_memory_region_ftype, void *)) +static char * +exec_make_note_section (struct target_ops *self, bfd *obfd, int *note_size) { - exec_ops.to_find_memory_regions = func; + error (_("Can't create a corefile")); } -static char *exec_make_note_section (bfd *, int *); - /* Fill in the exec file target vector. Very few entries need to be defined. */ @@ -896,16 +1102,15 @@ init_exec_ops (void) Specify the filename of the executable file."; exec_ops.to_open = exec_open; exec_ops.to_close = exec_close_1; - exec_ops.to_attach = find_default_attach; exec_ops.to_xfer_partial = exec_xfer_partial; exec_ops.to_get_section_table = exec_get_section_table; exec_ops.to_files_info = exec_files_info; exec_ops.to_insert_breakpoint = ignore; exec_ops.to_remove_breakpoint = ignore; - exec_ops.to_create_inferior = find_default_create_inferior; exec_ops.to_stratum = file_stratum; exec_ops.to_has_memory = exec_has_memory; exec_ops.to_make_corefile_notes = exec_make_note_section; + exec_ops.to_find_memory_regions = objfile_find_memory_regions; exec_ops.to_magic = OPS_MAGIC; } @@ -949,11 +1154,5 @@ Show writing into executable and core files."), NULL, show_write_files, &setlist, &showlist); - add_target (&exec_ops); -} - -static char * -exec_make_note_section (bfd *obfd, int *note_size) -{ - error (_("Can't create a corefile")); + add_target_with_completer (&exec_ops, filename_completer); }