diff options
author | Jason Molenda <jsm@bugshack.cygnus.com> | 1999-07-07 20:19:36 +0000 |
---|---|---|
committer | Jason Molenda <jsm@bugshack.cygnus.com> | 1999-07-07 20:19:36 +0000 |
commit | a87029ef15e59af2cc0b27cb4024b0db313fa88e (patch) | |
tree | a5cc2d6f8ebdbbd957642e72e0e88cc5fe5cd2e1 /gdb/exec.c | |
parent | 528824cc847e5a13831dd41e5aacb34679143c94 (diff) | |
download | gdb-a87029ef15e59af2cc0b27cb4024b0db313fa88e.tar.gz |
import gdb-1999-07-07 post reformat
Diffstat (limited to 'gdb/exec.c')
-rw-r--r-- | gdb/exec.c | 245 |
1 files changed, 125 insertions, 120 deletions
diff --git a/gdb/exec.c b/gdb/exec.c index 2e5e8bd12ee..2f9e46e509e 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -1,22 +1,23 @@ /* Work with executable files, for GDB. Copyright 1988, 1989, 1991, 1992, 1993, 1994, 1997, 1998 - Free Software Foundation, Inc. + Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "frame.h" @@ -88,7 +89,7 @@ int write_files = 0; #define NEED_TEXT_START_END (0) #endif CORE_ADDR text_start = 0; -CORE_ADDR text_end = 0; +CORE_ADDR text_end = 0; struct vmap *vmap; @@ -99,15 +100,15 @@ exec_close (quitting) { int need_symtab_cleanup = 0; struct vmap *vp, *nxt; - - for (nxt = vmap; nxt != NULL; ) + + for (nxt = vmap; nxt != NULL;) { vp = nxt; nxt = vp->nxt; /* if there is an objfile associated with this bfd, - free_objfile() will do proper cleanup of objfile *and* bfd. */ - + free_objfile() will do proper cleanup of objfile *and* bfd. */ + if (vp->objfile) { free_objfile (vp->objfile); @@ -120,10 +121,10 @@ exec_close (quitting) vp->name, bfd_errmsg (bfd_get_error ())); /* FIXME: This routine is #if 0'd in symfile.c. What should we - be doing here? Should we just free everything in - vp->objfile->symtabs? Should free_objfile do that? - FIXME-as-well: free_objfile already free'd vp->name, so it isn't - valid here. */ + be doing here? Should we just free everything in + vp->objfile->symtabs? Should free_objfile do that? + FIXME-as-well: free_objfile already free'd vp->name, so it isn't + valid here. */ free_named_symtabs (vp->name); free (vp); } @@ -143,7 +144,7 @@ exec_close (quitting) if (exec_ops.to_sections) { - free ((PTR)exec_ops.to_sections); + free ((PTR) exec_ops.to_sections); exec_ops.to_sections = NULL; exec_ops.to_sections_end = NULL; } @@ -151,20 +152,20 @@ exec_close (quitting) /* Process the first arg in ARGS as the new exec file. - This function is intended to be behave essentially the same - as exec_file_command, except that the latter will detect when - a target is being debugged, and will ask the user whether it - should be shut down first. (If the answer is "no", then the - new file is ignored.) + This function is intended to be behave essentially the same + as exec_file_command, except that the latter will detect when + a target is being debugged, and will ask the user whether it + should be shut down first. (If the answer is "no", then the + new file is ignored.) - This file is used by exec_file_command, to do the work of opening - and processing the exec file after any prompting has happened. + This file is used by exec_file_command, to do the work of opening + and processing the exec file after any prompting has happened. - And, it is used by child_attach, when the attach command was - given a pid but not a exec pathname, and the attach command could - figure out the pathname from the pid. (In this case, we shouldn't - ask the user whether the current target should be shut down -- - we're supplying the exec pathname late for good reason.) */ + And, it is used by child_attach, when the attach command was + given a pid but not a exec pathname, and the attach command could + figure out the pathname from the pid. (In this case, we shouldn't + ask the user whether the current target should be shut down -- + we're supplying the exec pathname late for good reason.) */ void exec_file_attach (args, from_tty) @@ -183,9 +184,9 @@ exec_file_attach (args, from_tty) { char *scratch_pathname; int scratch_chan; - + /* Scan through the args and pick up the first non option arg - as the filename. */ + as the filename. */ argv = buildargv (args); if (argv == NULL) @@ -193,24 +194,26 @@ exec_file_attach (args, from_tty) make_cleanup_freeargv (argv); - for (; (*argv != NULL) && (**argv == '-'); argv++) {;} + for (; (*argv != NULL) && (**argv == '-'); argv++) + {; + } if (*argv == NULL) error ("no exec file name was specified"); filename = tilde_expand (*argv); make_cleanup (free, filename); - - scratch_chan = openp (getenv ("PATH"), 1, filename, - write_files? O_RDWR|O_BINARY: O_RDONLY|O_BINARY, 0, + + scratch_chan = openp (getenv ("PATH"), 1, filename, + write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY, 0, &scratch_pathname); #if defined(__GO32__) || defined(_WIN32) if (scratch_chan < 0) - { - char *exename = alloca (strlen (filename) + 5); - strcat (strcpy (exename, filename), ".exe"); - scratch_chan = openp (getenv ("PATH"), 1, exename, write_files ? - O_RDWR|O_BINARY : O_RDONLY|O_BINARY, 0, &scratch_pathname); - } + { + char *exename = alloca (strlen (filename) + 5); + strcat (strcpy (exename, filename), ".exe"); + scratch_chan = openp (getenv ("PATH"), 1, exename, write_files ? + O_RDWR | O_BINARY : O_RDONLY | O_BINARY, 0, &scratch_pathname); + } #endif if (scratch_chan < 0) perror_with_name (filename); @@ -221,12 +224,12 @@ exec_file_attach (args, from_tty) 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. */ + 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 = strdup (scratch_pathname); make_cleanup (free, scratch_pathname); - + if (!bfd_check_format (exec_bfd, bfd_object)) { /* Make sure to close exec_bfd, or else "run" might try to use @@ -237,7 +240,7 @@ exec_file_attach (args, from_tty) } /* FIXME - This should only be run for RS6000, but the ifdef is a poor - way to accomplish. */ + way to accomplish. */ #ifdef IBM6000_TARGET /* Setup initial vmap. */ @@ -253,34 +256,34 @@ exec_file_attach (args, from_tty) #endif /* IBM6000_TARGET */ if (build_section_table (exec_bfd, &exec_ops.to_sections, - &exec_ops.to_sections_end)) + &exec_ops.to_sections_end)) { /* Make sure to close exec_bfd, or else "run" might try to use it. */ exec_close (0); - error ("\"%s\": can't find the file sections: %s", + error ("\"%s\": can't find the file sections: %s", scratch_pathname, bfd_errmsg (bfd_get_error ())); } /* text_end is sometimes used for where to put call dummies. A - few ports use these for other purposes too. */ + few ports use these for other purposes too. */ if (NEED_TEXT_START_END) { struct section_table *p; - + /* Set text_start to the lowest address of the start of any readonly code section and set text_end to the highest address of the end of any readonly code section. */ /* FIXME: The comment above does not match the code. The code checks for sections with are either code *or* readonly. */ - text_start = ~(CORE_ADDR)0; - text_end = (CORE_ADDR)0; + text_start = ~(CORE_ADDR) 0; + text_end = (CORE_ADDR) 0; for (p = exec_ops.to_sections; p < exec_ops.to_sections_end; p++) if (bfd_get_section_flags (p->bfd, p->the_bfd_section) & (SEC_CODE | SEC_READONLY)) { - if (text_start > p->addr) + if (text_start > p->addr) text_start = p->addr; if (text_end < p->endaddr) text_end = p->endaddr; @@ -303,9 +306,9 @@ exec_file_attach (args, from_tty) /* Process the first arg in ARGS as the new exec file. - Note that we have to explicitly ignore additional args, since we can - be called from file_command(), which also calls symbol_file_command() - which can take multiple args. */ + Note that we have to explicitly ignore additional args, since we can + be called from file_command(), which also calls symbol_file_command() + which can take multiple args. */ void exec_file_command (args, from_tty) @@ -336,8 +339,8 @@ file_command (arg, from_tty) if (file_changed_hook) file_changed_hook (arg); } - + /* Locate all mappable sections of a BFD file. table_pp_char is a char * to get it through bfd_map_over_sections; we cast it back to its proper type. */ @@ -348,7 +351,7 @@ add_to_section_table (abfd, asect, table_pp_char) sec_ptr asect; PTR table_pp_char; { - struct section_table **table_pp = (struct section_table **)table_pp_char; + struct section_table **table_pp = (struct section_table **) table_pp_char; flagword aflag; aflag = bfd_get_section_flags (abfd, asect); @@ -375,18 +378,18 @@ build_section_table (some_bfd, start, end) count = bfd_count_sections (some_bfd); if (*start) - free ((PTR)*start); + free ((PTR) * start); *start = (struct section_table *) xmalloc (count * sizeof (**start)); *end = *start; - bfd_map_over_sections (some_bfd, add_to_section_table, (char *)end); + bfd_map_over_sections (some_bfd, add_to_section_table, (char *) end); if (*end > *start + count) - abort(); + abort (); /* We could realloc the table, but it probably loses for most files. */ return 0; } static void -bfdsec_to_vmap(abfd, sect, arg3) +bfdsec_to_vmap (abfd, sect, arg3) bfd *abfd; sec_ptr sect; PTR arg3; @@ -432,7 +435,7 @@ map_vmap (abfd, arch) vp->bfd = abfd; vp->name = bfd_get_filename (arch ? arch : abfd); vp->member = arch ? bfd_get_filename (abfd) : ""; - + vmap_bfd.pbfd = arch; vmap_bfd.pvmap = vp; bfd_map_over_sections (abfd, bfdsec_to_vmap, &vmap_bfd); @@ -452,16 +455,16 @@ map_vmap (abfd, arch) Result is a length: - 0: We cannot handle this address and length. - > 0: We have handled N bytes starting at this address. - (If N == length, we did it all.) We might be able - to handle more bytes beyond this length, but no - promises. - < 0: We cannot handle this address, but if somebody - else handles (-N) bytes, we can start from there. + 0: We cannot handle this address and length. + > 0: We have handled N bytes starting at this address. + (If N == length, we did it all.) We might be able + to handle more bytes beyond this length, but no + promises. + < 0: We cannot handle this address, but if somebody + else handles (-N) bytes, we can start from there. - The same routine is used to handle both core and exec files; - we just tail-call it with more arguments to select between them. */ + The same routine is used to handle both core and exec files; + we just tail-call it with more arguments to select between them. */ int xfer_memory (memaddr, myaddr, len, write, target) @@ -478,7 +481,7 @@ xfer_memory (memaddr, myaddr, len, write, target) asection *section; if (len <= 0) - abort(); + abort (); if (overlay_debugging) { @@ -491,7 +494,7 @@ xfer_memory (memaddr, myaddr, len, write, target) xfer_fn = write ? bfd_set_section_contents : bfd_get_section_contents; nextsectaddr = memend; -#if 0 /* Stu's implementation */ +#if 0 /* Stu's implementation */ /* If a section has been specified, try to use it. Note that we cannot use the specified section directly. This is because it usually comes from the symbol file, which may be different from the exec or core file. Instead, we @@ -538,9 +541,9 @@ xfer_memory (memaddr, myaddr, len, write, target) { if (overlay_debugging && section && p->the_bfd_section && strcmp (section->name, p->the_bfd_section->name) != 0) - continue; /* not the section we need */ + continue; /* not the section we need */ if (memaddr >= p->addr) - if (memend <= p->endaddr) + if (memend <= p->endaddr) { /* Entire transfer is within this section. */ res = xfer_fn (p->bfd, p->the_bfd_section, myaddr, @@ -552,7 +555,7 @@ xfer_memory (memaddr, myaddr, len, write, target) /* This section ends before the transfer starts. */ continue; } - else + else { /* This section overlaps the transfer. Just do half. */ len = p->endaddr - memaddr; @@ -565,22 +568,22 @@ xfer_memory (memaddr, myaddr, len, write, target) } if (nextsectaddr >= memend) - return 0; /* We can't help */ + return 0; /* We can't help */ else - return - (nextsectaddr - memaddr); /* Next boundary where we can help */ + return -(nextsectaddr - memaddr); /* Next boundary where we can help */ } - + void print_section_info (t, abfd) - struct target_ops *t; - bfd *abfd; + struct target_ops *t; + bfd *abfd; { struct section_table *p; - printf_filtered ("\t`%s', ", bfd_get_filename(abfd)); + printf_filtered ("\t`%s', ", bfd_get_filename (abfd)); wrap_here (" "); - printf_filtered ("file type %s.\n", bfd_get_target(abfd)); + printf_filtered ("file type %s.\n", bfd_get_target (abfd)); if (abfd == exec_bfd) { printf_filtered ("\tEntry point: "); @@ -616,14 +619,14 @@ exec_files_info (t) printf_unfiltered ("\tMapping info for file `%s'.\n", vmap->name); printf_unfiltered ("\t %8.8s %8.8s %8.8s %8.8s %8.8s %s\n", - "tstart", "tend", "dstart", "dend", "section", - "file(member)"); - - for (vp = vmap; vp; vp = vp->nxt) - printf_unfiltered ("\t0x%8.8x 0x%8.8x 0x%8.8x 0x%8.8x %s%s%s%s\n", - vp->tstart, vp->tend, vp->dstart, vp->dend, vp->name, - *vp->member ? "(" : "", vp->member, - *vp->member ? ")" : ""); + "tstart", "tend", "dstart", "dend", "section", + "file(member)"); + + for (vp = vmap; vp; vp = vp->nxt) + printf_unfiltered ("\t0x%8.8x 0x%8.8x 0x%8.8x 0x%8.8x %s%s%s%s\n", + vp->tstart, vp->tend, vp->dstart, vp->dend, vp->name, + *vp->member ? "(" : "", vp->member, + *vp->member ? ")" : ""); } } @@ -638,9 +641,9 @@ exec_set_section_offsets (text_off, data_off, bss_off) bfd_signed_vma bss_off; { struct section_table *sect; - - for (sect = exec_ops.to_sections; - sect < exec_ops.to_sections_end; + + for (sect = exec_ops.to_sections; + sect < exec_ops.to_sections_end; sect++) { flagword flags; @@ -649,17 +652,17 @@ exec_set_section_offsets (text_off, data_off, bss_off) if (flags & SEC_CODE) { - sect->addr += text_off; + sect->addr += text_off; sect->endaddr += text_off; } else if (flags & (SEC_DATA | SEC_LOAD)) { - sect->addr += data_off; + sect->addr += data_off; sect->endaddr += data_off; } else if (flags & SEC_ALLOC) { - sect->addr += bss_off; + sect->addr += bss_off; sect->endaddr += bss_off; } } @@ -681,23 +684,25 @@ set_section_command (args, from_tty) error ("Must specify section name and its virtual address"); /* Parse out section name */ - for (secname = args; !isspace(*args); args++) ; + for (secname = args; !isspace (*args); args++); seclen = args - secname; /* Parse out new virtual address */ secaddr = parse_and_eval_address (args); - for (p = exec_ops.to_sections; p < exec_ops.to_sections_end; p++) { - if (!strncmp (secname, bfd_section_name (exec_bfd, p->the_bfd_section), seclen) - && bfd_section_name (exec_bfd, p->the_bfd_section)[seclen] == '\0') { - offset = secaddr - p->addr; - p->addr += offset; - p->endaddr += offset; - if (from_tty) - exec_files_info(&exec_ops); - return; + for (p = exec_ops.to_sections; p < exec_ops.to_sections_end; p++) + { + if (!strncmp (secname, bfd_section_name (exec_bfd, p->the_bfd_section), seclen) + && bfd_section_name (exec_bfd, p->the_bfd_section)[seclen] == '\0') + { + offset = secaddr - p->addr; + p->addr += offset; + p->endaddr += offset; + if (from_tty) + exec_files_info (&exec_ops); + return; + } } - } if (seclen >= sizeof (secprint)) seclen = sizeof (secprint) - 1; strncpy (secprint, secname, seclen); @@ -740,7 +745,7 @@ Specify the filename of the executable file."; exec_ops.to_clone_and_follow_inferior = find_default_clone_and_follow_inferior; exec_ops.to_stratum = file_stratum; exec_ops.to_has_memory = 1; - exec_ops.to_magic = OPS_MAGIC; + exec_ops.to_magic = OPS_MAGIC; } void @@ -763,24 +768,24 @@ No arg means to have no executable file and no symbols.", &cmdlist); } c = add_cmd ("exec-file", class_files, exec_file_command, - "Use FILE as program for getting contents of pure memory.\n\ + "Use FILE as program for getting contents of pure memory.\n\ If FILE cannot be found as specified, your execution directory path\n\ is searched for a command of that name.\n\ No arg means have no executable file.", &cmdlist); c->completer = filename_completer; add_com ("section", class_files, set_section_command, - "Change the base address of section SECTION of the exec file to ADDR.\n\ + "Change the base address of section SECTION of the exec file to ADDR.\n\ This can be used if the exec file does not contain section addresses,\n\ (such as in the a.out format), or when the addresses specified in the\n\ file itself are wrong. Each section must be changed separately. The\n\ ``info files'' command lists all the sections and their addresses."); add_show_from_set - (add_set_cmd ("write", class_support, var_boolean, (char *)&write_files, + (add_set_cmd ("write", class_support, var_boolean, (char *) &write_files, "Set writing into executable and core files.", &setlist), &showlist); - + add_target (&exec_ops); } |