X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcorefile.c;h=570f34075d8d46159dee20b004d25a50869d1eff;hb=525226b563e98fc59a22393f2a145b7c14d6eec1;hp=8a0073a83df4b5f14dc2a2f77ddaffe827517e45;hpb=1bac305b7206372b7f2266851d6cc1ee2cb9d7ca;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corefile.c b/gdb/corefile.c index 8a0073a83d..570f34075d 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -35,23 +35,25 @@ #include "dis-asm.h" #include "gdb_stat.h" #include "completer.h" +#include "exceptions.h" /* Local function declarations. */ 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. - If there are two or more hooks, they are set in exec_file_extra_hooks[], - and exec_file_display_hook is set to a function that calls all of them. - This extra complexity is needed to preserve compatibility with - old code that assumed that only one hook could be set, and which called - exec_file_display_hook directly. */ +/* 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. If there are two or more hooks, they are set in + exec_file_extra_hooks[], and deprecated_exec_file_display_hook is + set to a function that calls all of them. This extra complexity is + needed to preserve compatibility with old code that assumed that + only one hook could be set, and which called + deprecated_exec_file_display_hook directly. */ typedef void (*hook_type) (char *); -hook_type exec_file_display_hook; /* the original hook */ +hook_type deprecated_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 */ @@ -71,7 +73,7 @@ core_file_command (char *filename, int from_tty) t = find_core_target (); if (t == NULL) - error ("GDB can't read core files on this machine."); + error (_("GDB can't read core files on this machine.")); if (!filename) (t->to_detach) (filename, from_tty); @@ -80,8 +82,9 @@ core_file_command (char *filename, int from_tty) } -/* If there are two or more functions that wish to hook into exec_file_command, - * this function will call all of the hook functions. */ +/* 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 (char *filename) @@ -100,16 +103,16 @@ specify_exec_file_hook (void (*hook) (char *)) { hook_type *new_array; - if (exec_file_display_hook != NULL) + if (deprecated_exec_file_display_hook != NULL) { /* There's already a hook installed. Arrange to have both it * and the subsequent hooks called. */ if (exec_file_hook_count == 0) { - /* If this is the first extra hook, initialize the hook array. */ + /* 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[0] = exec_file_display_hook; - exec_file_display_hook = call_extra_exec_file_hooks; + exec_file_extra_hooks[0] = deprecated_exec_file_display_hook; + deprecated_exec_file_display_hook = call_extra_exec_file_hooks; exec_file_hook_count = 1; } @@ -124,7 +127,7 @@ specify_exec_file_hook (void (*hook) (char *)) exec_file_extra_hooks[exec_file_hook_count - 1] = hook; } else - exec_file_display_hook = hook; + deprecated_exec_file_display_hook = hook; } /* The exec file must be closed before running an inferior. @@ -178,9 +181,9 @@ 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."); + warning (_("core file may not match specified executable file.")); else if (bfd_get_mtime (exec_bfd) > bfd_get_mtime (core_bfd)) - warning ("exec file is newer than core file."); + warning (_("exec file is newer than core file.")); } } @@ -196,8 +199,8 @@ get_exec_file (int err) if (!err) return NULL; - error ("No executable file specified.\n\ -Use the \"file\" or \"exec-file\" command."); + error (_("No executable file specified.\n\ +Use the \"file\" or \"exec-file\" command.")); return NULL; } @@ -215,12 +218,12 @@ memory_error (int status, CORE_ADDR memaddr) /* Actually, address between memaddr and memaddr + len was out of bounds. */ fprintf_unfiltered (tmp_stream, "Cannot access memory at address "); - print_address_numeric (memaddr, 1, tmp_stream); + deprecated_print_address_numeric (memaddr, 1, tmp_stream); } else { fprintf_filtered (tmp_stream, "Error accessing memory address "); - print_address_numeric (memaddr, 1, tmp_stream); + deprecated_print_address_numeric (memaddr, 1, tmp_stream); fprintf_filtered (tmp_stream, ": %s.", safe_strerror (status)); } @@ -238,28 +241,6 @@ read_memory (CORE_ADDR memaddr, char *myaddr, int len) memory_error (status, memaddr); } -/* Like target_read_memory, but slightly different parameters. */ -int -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 (int status, bfd_vma memaddr, disassemble_info *info) -{ - memory_error (status, memaddr); -} - -/* Like print_address with slightly different parameters. */ -void -dis_asm_print_address (bfd_vma addr, struct disassemble_info *info) -{ - print_address (addr, info->stream); -} - /* Argument / return result struct for use with do_captured_read_memory_integer(). MEMADDR and LEN are filled in by gdb_read_memory_integer(). RESULT is the contents that were @@ -332,8 +313,8 @@ read_memory_unsigned_integer (CORE_ADDR memaddr, int len) void read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len) { - register char *cp; - register int i; + char *cp; + int i; int cnt; cp = buffer; @@ -366,11 +347,13 @@ read_memory_typed_address (CORE_ADDR addr, struct type *type) /* Same as target_write_memory, but report an error if can't write. */ void -write_memory (CORE_ADDR memaddr, char *myaddr, int len) +write_memory (CORE_ADDR memaddr, const bfd_byte *myaddr, int len) { int status; - - status = target_write_memory (memaddr, myaddr, len); + bfd_byte *bytes = alloca (len); + + memcpy (bytes, myaddr, len); + status = target_write_memory (memaddr, bytes, len); if (status != 0) memory_error (status, memaddr); } @@ -459,19 +442,21 @@ void _initialize_core (void) { struct cmd_list_element *c; - c = add_cmd ("core-file", class_files, core_file_command, - "Use FILE as core dump for examining memory and registers.\n\ + c = add_cmd ("core-file", class_files, core_file_command, _("\ +Use FILE as core dump for examining memory and registers.\n\ No arg means have no core file. This command has been superseded by the\n\ -`target core' and `detach' commands.", &cmdlist); +`target core' and `detach' commands."), &cmdlist); set_cmd_completer (c, filename_completer); - c = add_set_cmd ("gnutarget", class_files, var_string_noescape, - (char *) &gnutarget_string, - "Set the current BFD target.\n\ -Use `set gnutarget auto' to specify automatic detection.", - &setlist); - set_cmd_sfunc (c, set_gnutarget_command); - add_show_from_set (c, &showlist); + + add_setshow_string_noescape_cmd ("gnutarget", class_files, + &gnutarget_string, _("(\ +Set the current BFD target."), _("\ +Show the current BFD target."), _("\ +Use `set gnutarget auto' to specify automatic detection."), + set_gnutarget_command, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); if (getenv ("GNUTARGET")) set_gnutarget (getenv ("GNUTARGET"));