X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcorefile.c;h=6ff1ac5fe2cf1ca51e86f290f814d0ab2e42a3ac;hb=34620563ede5a71f360ccceb85121a9b70e65c73;hp=b720b50323a0b07aeb44631775517c6c017d005e;hpb=392a587b0562bfd8561bc15ad2625a4f49f461f0;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corefile.c b/gdb/corefile.c index b720b50323..6ff1ac5fe2 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -1,29 +1,30 @@ /* Core dump and executable file functions above target vector, for GDB. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994 + Copyright 1986, 1987, 1989, 1991-1994, 2000 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 "gdb_string.h" #include #include #include -#include "frame.h" /* required by inferior.h */ +#include "frame.h" /* required by inferior.h */ #include "inferior.h" #include "symtab.h" #include "command.h" @@ -39,8 +40,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Local function declarations. */ -extern void _initialize_core PARAMS ((void)); -static void call_extra_exec_file_hooks PARAMS ((char *filename)); +extern void _initialize_core (void); +static void call_extra_exec_file_hooks (char *filename); /* You can have any number of hooks for `exec_file_command' command to call. If there's only one hook, it is set in exec_file_display hook. @@ -50,27 +51,25 @@ static void call_extra_exec_file_hooks PARAMS ((char *filename)); old code that assumed that only one hook could be set, and which called exec_file_display_hook directly. */ -typedef void (*hook_type) PARAMS ((char *)); +typedef void (*hook_type) (char *); -hook_type exec_file_display_hook; /* the original hook */ +hook_type exec_file_display_hook; /* the original hook */ static hook_type *exec_file_extra_hooks; /* array of additional hooks */ -static int exec_file_hook_count = 0; /* size of array */ +static int exec_file_hook_count = 0; /* size of array */ /* Binary file diddling handle for the core file. */ bfd *core_bfd = NULL; - + /* Backward compatability with old way of specifying core files. */ void -core_file_command (filename, from_tty) - char *filename; - int from_tty; +core_file_command (char *filename, int from_tty) { struct target_ops *t; - dont_repeat (); /* Either way, seems bogus. */ + dont_repeat (); /* Either way, seems bogus. */ t = find_core_target (); if (t != NULL) @@ -78,44 +77,43 @@ core_file_command (filename, from_tty) (t->to_detach) (filename, from_tty); else { - /* Yes, we were given the path of a core file. Do we already - have a symbol file? If not, can we determine it from the - core file? If we can, do so. - */ + /* Yes, we were given the path of a core file. Do we already + have a symbol file? If not, can we determine it from the + core file? If we can, do so. + */ #ifdef HPUXHPPA - if (symfile_objfile == NULL) - { - char * symfile; - symfile = t->to_core_file_to_sym_file (filename); - if (symfile) - { - char * symfile_copy = strdup (symfile); - - make_cleanup (free, symfile_copy); - symbol_file_command (symfile_copy, from_tty); - } - else - warning ("Unknown symbols for '%s'; use the 'symbol-file' command.", filename); - } + if (symfile_objfile == NULL) + { + char *symfile; + symfile = t->to_core_file_to_sym_file (filename); + if (symfile) + { + char *symfile_copy = xstrdup (symfile); + + make_cleanup (free, symfile_copy); + symbol_file_command (symfile_copy, from_tty); + } + else + warning ("Unknown symbols for '%s'; use the 'symbol-file' command.", filename); + } #endif - (t->to_open) (filename, from_tty); + (t->to_open) (filename, from_tty); } else error ("GDB can't read core files on this machine."); } - + /* If there are two or more functions that wish to hook into exec_file_command, * this function will call all of the hook functions. */ static void -call_extra_exec_file_hooks (filename) - char *filename; +call_extra_exec_file_hooks (char *filename) { int i; for (i = 0; i < exec_file_hook_count; i++) - (*exec_file_extra_hooks[i])(filename); + (*exec_file_extra_hooks[i]) (filename); } /* Call this to specify the hook for exec_file_command to call back. @@ -123,7 +121,7 @@ call_extra_exec_file_hooks (filename) void specify_exec_file_hook (hook) - void (*hook) PARAMS ((char *)); + void (*hook) (char *); { hook_type *new_array; @@ -134,7 +132,7 @@ specify_exec_file_hook (hook) if (exec_file_hook_count == 0) { /* If this is the first extra hook, initialize the hook array. */ - exec_file_extra_hooks = (hook_type *) xmalloc (sizeof(hook_type)); + exec_file_extra_hooks = (hook_type *) xmalloc (sizeof (hook_type)); exec_file_extra_hooks[0] = exec_file_display_hook; exec_file_display_hook = call_extra_exec_file_hooks; exec_file_hook_count = 1; @@ -146,7 +144,7 @@ specify_exec_file_hook (hook) exec_file_hook_count++; new_array = (hook_type *) xrealloc (exec_file_extra_hooks, - exec_file_hook_count * sizeof(hook_type)); + exec_file_hook_count * sizeof (hook_type)); exec_file_extra_hooks = new_array; exec_file_extra_hooks[exec_file_hook_count - 1] = hook; } @@ -159,18 +157,18 @@ specify_exec_file_hook (hook) be reopened. */ void -close_exec_file () +close_exec_file (void) { -#if 0 /* FIXME */ +#if 0 /* FIXME */ if (exec_bfd) bfd_tempclose (exec_bfd); #endif } void -reopen_exec_file () +reopen_exec_file (void) { -#if 0 /* FIXME */ +#if 0 /* FIXME */ if (exec_bfd) bfd_reopen (exec_bfd); #else @@ -182,11 +180,11 @@ reopen_exec_file () /* Don't do anything if the current target isn't exec. */ if (exec_bfd == NULL || strcmp (target_shortname, "exec") != 0) return; - + /* If the timestamp of the exec file has changed, reopen it. */ - filename = strdup (bfd_get_filename (exec_bfd)); + filename = xstrdup (bfd_get_filename (exec_bfd)); make_cleanup (free, filename); - mtime = bfd_get_mtime(exec_bfd); + mtime = bfd_get_mtime (exec_bfd); res = stat (filename, &st); if (mtime && mtime != st.st_mtime) @@ -198,13 +196,13 @@ reopen_exec_file () print a warning if they don't go together. */ void -validate_files () +validate_files (void) { if (exec_bfd && core_bfd) { if (!core_file_matches_executable_p (core_bfd, exec_bfd)) warning ("core file may not match specified executable file."); - else if (bfd_get_mtime(exec_bfd) > bfd_get_mtime(core_bfd)) + else if (bfd_get_mtime (exec_bfd) > bfd_get_mtime (core_bfd)) warning ("exec file is newer than core file."); } } @@ -214,52 +212,48 @@ validate_files () otherwise return 0 in that case. */ char * -get_exec_file (err) - int err; +get_exec_file (int err) { - if (exec_bfd) return bfd_get_filename(exec_bfd); - if (!err) return NULL; + if (exec_bfd) + return bfd_get_filename (exec_bfd); + if (!err) + return NULL; error ("No executable file specified.\n\ Use the \"file\" or \"exec-file\" command."); return NULL; } - + /* Report a memory error with error(). */ void -memory_error (status, memaddr) - int status; - CORE_ADDR memaddr; +memory_error (int status, CORE_ADDR memaddr) { + struct ui_file *tmp_stream = mem_fileopen (); + make_cleanup_ui_file_delete (tmp_stream); + if (status == EIO) { /* Actually, address between memaddr and memaddr + len - was out of bounds. */ - error_begin (); - printf_filtered ("Cannot access memory at address "); - print_address_numeric (memaddr, 1, gdb_stdout); - printf_filtered (".\n"); - return_to_top_level (RETURN_ERROR); + was out of bounds. */ + fprintf_unfiltered (tmp_stream, "Cannot access memory at address "); + print_address_numeric (memaddr, 1, tmp_stream); } else { - error_begin (); - printf_filtered ("Error accessing memory address "); - print_address_numeric (memaddr, 1, gdb_stdout); - printf_filtered (": %s.\n", - safe_strerror (status)); - return_to_top_level (RETURN_ERROR); + fprintf_filtered (tmp_stream, "Error accessing memory address "); + print_address_numeric (memaddr, 1, tmp_stream); + fprintf_filtered (tmp_stream, ": %s.", + safe_strerror (status)); } + + error_stream (tmp_stream); } /* Same as target_read_memory, but report an error if can't read. */ void -read_memory (memaddr, myaddr, len) - CORE_ADDR memaddr; - char *myaddr; - int len; +read_memory (CORE_ADDR memaddr, char *myaddr, int len) { int status; status = target_read_memory (memaddr, myaddr, len); @@ -267,56 +261,31 @@ read_memory (memaddr, myaddr, len) memory_error (status, memaddr); } -void -read_memory_section (memaddr, myaddr, len, bfd_section) - CORE_ADDR memaddr; - char *myaddr; - int len; - asection *bfd_section; -{ - int status; - status = target_read_memory_section (memaddr, myaddr, len, bfd_section); - if (status != 0) - memory_error (status, memaddr); -} - /* Like target_read_memory, but slightly different parameters. */ - int -dis_asm_read_memory (memaddr, myaddr, len, info) - bfd_vma memaddr; - bfd_byte *myaddr; - int len; - disassemble_info *info; +dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len, + disassemble_info *info) { return target_read_memory (memaddr, (char *) myaddr, len); } /* Like memory_error with slightly different parameters. */ void -dis_asm_memory_error (status, memaddr, info) - int status; - bfd_vma memaddr; - disassemble_info *info; +dis_asm_memory_error (int status, bfd_vma memaddr, disassemble_info *info) { memory_error (status, memaddr); } /* Like print_address with slightly different parameters. */ void -dis_asm_print_address (addr, info) - bfd_vma addr; - struct disassemble_info *info; +dis_asm_print_address (bfd_vma addr, struct disassemble_info *info) { print_address (addr, info->stream); } /* Same as target_write_memory, but report an error if can't write. */ void -write_memory (memaddr, myaddr, len) - CORE_ADDR memaddr; - char *myaddr; - int len; +write_memory (CORE_ADDR memaddr, char *myaddr, int len) { int status; @@ -328,9 +297,7 @@ write_memory (memaddr, myaddr, len) /* Read an integer from debugged memory, given address and number of bytes. */ LONGEST -read_memory_integer (memaddr, len) - CORE_ADDR memaddr; - int len; +read_memory_integer (CORE_ADDR memaddr, int len) { char buf[sizeof (LONGEST)]; @@ -339,9 +306,7 @@ read_memory_integer (memaddr, len) } ULONGEST -read_memory_unsigned_integer (memaddr, len) - CORE_ADDR memaddr; - int len; +read_memory_unsigned_integer (CORE_ADDR memaddr, int len) { char buf[sizeof (ULONGEST)]; @@ -350,12 +315,9 @@ read_memory_unsigned_integer (memaddr, len) } void -read_memory_string (memaddr, buffer, max_len) - CORE_ADDR memaddr; - char * buffer; - int max_len; +read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len) { - register char * cp; + register char *cp; register int i; int cnt; @@ -363,23 +325,23 @@ read_memory_string (memaddr, buffer, max_len) while (1) { if (cp - buffer >= max_len) - { - buffer[max_len - 1] = '\0'; - break; - } + { + buffer[max_len - 1] = '\0'; + break; + } cnt = max_len - (cp - buffer); if (cnt > 8) cnt = 8; read_memory (memaddr + (int) (cp - buffer), cp, cnt); for (i = 0; i < cnt && *cp; i++, cp++) - ; /* null body */ + ; /* null body */ if (i < cnt && !*cp) - break; + break; } } - + #if 0 /* Enable after 4.12. It is not tested. */ @@ -415,7 +377,7 @@ generic_search (len, data, mask, startaddr, increment, lorange, hirange try_again: curaddr += increment; } - *addr_found = (CORE_ADDR)0; + *addr_found = (CORE_ADDR) 0; return; } #endif /* 0 */ @@ -427,14 +389,10 @@ char *gnutarget; /* Same thing, except it is "auto" not NULL for the default case. */ static char *gnutarget_string; -static void set_gnutarget_command - PARAMS ((char *, int, struct cmd_list_element *)); +static void set_gnutarget_command (char *, int, struct cmd_list_element *); static void -set_gnutarget_command (ignore, from_tty, c) - char *ignore; - int from_tty; - struct cmd_list_element *c; +set_gnutarget_command (char *ignore, int from_tty, struct cmd_list_element *c) { if (STREQ (gnutarget_string, "auto")) gnutarget = NULL; @@ -444,8 +402,7 @@ set_gnutarget_command (ignore, from_tty, c) /* Set the gnutarget. */ void -set_gnutarget (newtarget) - char *newtarget; +set_gnutarget (char *newtarget) { if (gnutarget_string != NULL) free (gnutarget_string); @@ -454,7 +411,7 @@ set_gnutarget (newtarget) } void -_initialize_core() +_initialize_core (void) { struct cmd_list_element *c; c = add_cmd ("core-file", class_files, core_file_command, @@ -464,10 +421,10 @@ No arg means have no core file. This command has been superseded by the\n\ c->completer = filename_completer; c = add_set_cmd ("gnutarget", class_files, var_string_noescape, - (char *) &gnutarget_string, - "Set the current BFD target.\n\ + (char *) &gnutarget_string, + "Set the current BFD target.\n\ Use `set gnutarget auto' to specify automatic detection.", - &setlist); + &setlist); c->function.sfunc = set_gnutarget_command; add_show_from_set (c, &showlist);