X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcorefile.c;h=eba36d6419aa76bc9d5be4c7a14cf328a4a6f1b3;hb=be9033582599e50521feb879d7476756c2c8c017;hp=78dbbc2b86da3e0b332800b1ef5ec822ccd550bd;hpb=f5656eadf4383cc733b96ff49ba8efbea6922ad3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corefile.c b/gdb/corefile.c index 78dbbc2b86..eba36d6419 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -1,7 +1,6 @@ /* Core dump and executable file functions above target vector, for GDB. - Copyright (C) 1986-1987, 1989, 1991-1994, 1996-2001, 2003, 2006-2012 - Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -19,8 +18,6 @@ along with this program. If not, see . */ #include "defs.h" -#include "gdb_string.h" -#include #include #include #include "inferior.h" @@ -31,15 +28,14 @@ #include "target.h" #include "gdbcore.h" #include "dis-asm.h" -#include "gdb_stat.h" +#include #include "completer.h" -#include "exceptions.h" #include "observer.h" +#include "cli/cli-utils.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 @@ -50,7 +46,7 @@ static void call_extra_exec_file_hooks (char *filename); only one hook could be set, and which called deprecated_exec_file_display_hook directly. */ -typedef void (*hook_type) (char *); +typedef void (*hook_type) (const char *); hook_type deprecated_exec_file_display_hook; /* The original hook. */ static hook_type *exec_file_extra_hooks; /* Array of additional @@ -87,7 +83,7 @@ core_file_command (char *filename, int from_tty) functions. */ static void -call_extra_exec_file_hooks (char *filename) +call_extra_exec_file_hooks (const char *filename) { int i; @@ -99,7 +95,7 @@ call_extra_exec_file_hooks (char *filename) This is called from the x-window display code. */ void -specify_exec_file_hook (void (*hook) (char *)) +specify_exec_file_hook (void (*hook) (const char *)) { hook_type *new_array; @@ -111,8 +107,7 @@ specify_exec_file_hook (void (*hook) (char *)) { /* 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 = XNEW (hook_type); 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; @@ -182,8 +177,8 @@ validate_files (void) char * get_exec_file (int err) { - if (exec_bfd) - return bfd_get_filename (exec_bfd); + if (exec_filename) + return exec_filename; if (!err) return NULL; @@ -193,22 +188,53 @@ Use the \"file\" or \"exec-file\" command.")); } -/* Report a memory error by throwing a MEMORY_ERROR error. */ +char * +memory_error_message (enum target_xfer_status err, + struct gdbarch *gdbarch, CORE_ADDR memaddr) +{ + switch (err) + { + case TARGET_XFER_E_IO: + /* Actually, address between memaddr and memaddr + len was out of + bounds. */ + return xstrprintf (_("Cannot access memory at address %s"), + paddress (gdbarch, memaddr)); + case TARGET_XFER_UNAVAILABLE: + return xstrprintf (_("Memory at address %s unavailable."), + paddress (gdbarch, memaddr)); + default: + internal_error (__FILE__, __LINE__, + "unhandled target_xfer_status: %s (%s)", + target_xfer_status_to_string (err), + plongest (err)); + } +} + +/* Report a memory error by throwing a suitable exception. */ void -memory_error (int status, CORE_ADDR memaddr) +memory_error (enum target_xfer_status err, CORE_ADDR memaddr) { - if (status == EIO) - /* Actually, address between memaddr and memaddr + len was out of - bounds. */ - throw_error (MEMORY_ERROR, - _("Cannot access memory at address %s"), - paddress (target_gdbarch (), memaddr)); - else - throw_error (MEMORY_ERROR, - _("Error accessing memory address %s: %s."), - paddress (target_gdbarch (), memaddr), - safe_strerror (status)); + char *str; + enum errors exception = GDB_NO_ERROR; + + /* Build error string. */ + str = memory_error_message (err, target_gdbarch (), memaddr); + make_cleanup (xfree, str); + + /* Choose the right error to throw. */ + switch (err) + { + case TARGET_XFER_E_IO: + exception = MEMORY_ERROR; + break; + case TARGET_XFER_UNAVAILABLE: + exception = NOT_AVAILABLE_ERROR; + break; + } + + /* Throw it. */ + throw_error (exception, ("%s"), str); } /* Same as target_read_memory, but report an error if can't read. */ @@ -216,11 +242,26 @@ memory_error (int status, CORE_ADDR memaddr) void read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) { - int status; + ULONGEST xfered = 0; - status = target_read_memory (memaddr, myaddr, len); - if (status != 0) - memory_error (status, memaddr); + while (xfered < len) + { + enum target_xfer_status status; + ULONGEST xfered_len; + + status = target_xfer_partial (current_target.beneath, + TARGET_OBJECT_MEMORY, NULL, + myaddr + xfered, NULL, + memaddr + xfered, len - xfered, + &xfered_len); + + if (status != TARGET_XFER_OK) + memory_error (status == TARGET_XFER_EOF ? TARGET_XFER_E_IO : status, + memaddr + xfered); + + xfered += xfered_len; + QUIT; + } } /* Same as target_read_stack, but report an error if can't read. */ @@ -235,38 +276,16 @@ read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) memory_error (status, memaddr); } -/* 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 - successfully read from MEMADDR of length LEN. */ +/* Same as target_read_code, but report an error if can't read. */ -struct captured_read_memory_integer_arguments -{ - CORE_ADDR memaddr; - int len; - enum bfd_endian byte_order; - LONGEST result; -}; - -/* Helper function for gdb_read_memory_integer(). DATA must be a - pointer to a captured_read_memory_integer_arguments struct. - Return 1 if successful. Note that the catch_errors() interface - will return 0 if an error occurred while reading memory. This - choice of return code is so that we can distinguish between - success and failure. */ - -static int -do_captured_read_memory_integer (void *data) +void +read_code (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) { - struct captured_read_memory_integer_arguments *args - = (struct captured_read_memory_integer_arguments*) data; - CORE_ADDR memaddr = args->memaddr; - int len = args->len; - enum bfd_endian byte_order = args->byte_order; - - args->result = read_memory_integer (memaddr, len, byte_order); + int status; - return 1; + status = target_read_code (memaddr, myaddr, len); + if (status != 0) + memory_error (status, memaddr); } /* Read memory at MEMADDR of length LEN and put the contents in @@ -278,19 +297,13 @@ safe_read_memory_integer (CORE_ADDR memaddr, int len, enum bfd_endian byte_order, LONGEST *return_value) { - int status; - struct captured_read_memory_integer_arguments args; - - args.memaddr = memaddr; - args.len = len; - args.byte_order = byte_order; + gdb_byte buf[sizeof (LONGEST)]; - status = catch_errors (do_captured_read_memory_integer, &args, - "", RETURN_MASK_ALL); - if (status) - *return_value = args.result; + if (target_read_memory (memaddr, buf, len)) + return 0; - return status; + *return_value = extract_signed_integer (buf, len, byte_order); + return 1; } LONGEST @@ -313,6 +326,26 @@ read_memory_unsigned_integer (CORE_ADDR memaddr, int len, return extract_unsigned_integer (buf, len, byte_order); } +LONGEST +read_code_integer (CORE_ADDR memaddr, int len, + enum bfd_endian byte_order) +{ + gdb_byte buf[sizeof (LONGEST)]; + + read_code (memaddr, buf, len); + return extract_signed_integer (buf, len, byte_order); +} + +ULONGEST +read_code_unsigned_integer (CORE_ADDR memaddr, int len, + enum bfd_endian byte_order) +{ + gdb_byte buf[sizeof (ULONGEST)]; + + read_code (memaddr, buf, len); + return extract_unsigned_integer (buf, len, byte_order); +} + void read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len) { @@ -331,7 +364,7 @@ read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len) cnt = max_len - (cp - buffer); if (cnt > 8) cnt = 8; - read_memory (memaddr + (int) (cp - buffer), cp, cnt); + read_memory (memaddr + (int) (cp - buffer), (gdb_byte *) cp, cnt); for (i = 0; i < cnt && *cp; i++, cp++) ; /* null body */ @@ -349,8 +382,8 @@ read_memory_typed_address (CORE_ADDR addr, struct type *type) return extract_typed_address (buf, type); } -/* Same as target_write_memory, but report an error if can't - write. */ +/* See gdbcore.h. */ + void write_memory (CORE_ADDR memaddr, const bfd_byte *myaddr, ssize_t len) @@ -420,12 +453,41 @@ static void set_gnutarget_command (char *ignore, int from_tty, struct cmd_list_element *c) { + char *gend = gnutarget_string + strlen (gnutarget_string); + + gend = remove_trailing_whitespace (gnutarget_string, gend); + *gend = '\0'; + if (strcmp (gnutarget_string, "auto") == 0) gnutarget = NULL; else gnutarget = gnutarget_string; } +/* A completion function for "set gnutarget". */ + +static VEC (char_ptr) * +complete_set_gnutarget (struct cmd_list_element *cmd, + const char *text, const char *word) +{ + static const char **bfd_targets; + + if (bfd_targets == NULL) + { + int last; + + bfd_targets = bfd_target_list (); + for (last = 0; bfd_targets[last] != NULL; ++last) + ; + + bfd_targets = xrealloc (bfd_targets, (last + 2) * sizeof (const char **)); + bfd_targets[last] = "auto"; + bfd_targets[last + 1] = NULL; + } + + return complete_on_enum (bfd_targets, text, word); +} + /* Set the gnutarget. */ void set_gnutarget (char *newtarget) @@ -448,14 +510,17 @@ No arg means have no core file. This command has been superseded by the\n\ set_cmd_completer (c, filename_completer); - add_setshow_string_noescape_cmd ("gnutarget", class_files, - &gnutarget_string, _("\ + c = 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, - show_gnutarget_string, - &setlist, &showlist); + set_gnutarget_command, + show_gnutarget_string, + &setlist, &showlist); + set_cmd_completer (c, complete_set_gnutarget); + + add_alias_cmd ("g", "gnutarget", class_files, 1, &setlist); if (getenv ("GNUTARGET")) set_gnutarget (getenv ("GNUTARGET"));