X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcorefile.c;h=498628c5af6a06dba87b76ca6fec6c32a4c289c3;hb=06a6207a1ab458521656f293bb1ca8fd013d6f7c;hp=eba36d6419aa76bc9d5be4c7a14cf328a4a6f1b3;hpb=8d7493201cf01c9836403695f67f7e157341bfd5;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corefile.c b/gdb/corefile.c index eba36d6419..498628c5af 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -1,6 +1,6 @@ /* Core dump and executable file functions above target vector, for GDB. - Copyright (C) 1986-2015 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -30,12 +30,9 @@ #include "dis-asm.h" #include #include "completer.h" -#include "observer.h" +#include "observable.h" #include "cli/cli-utils.h" - -/* Local function declarations. */ - -extern void _initialize_core (void); +#include "gdbarch.h" /* 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 @@ -53,29 +50,6 @@ static hook_type *exec_file_extra_hooks; /* Array of additional hooks. */ static int exec_file_hook_count = 0; /* Size of array. */ -/* Binary file diddling handle for the core file. */ - -bfd *core_bfd = NULL; - -/* corelow.c target. It is never NULL after GDB initialization. */ - -struct target_ops *core_target; - - -/* Backward compatability with old way of specifying core files. */ - -void -core_file_command (char *filename, int from_tty) -{ - dont_repeat (); /* Either way, seems bogus. */ - - gdb_assert (core_target != NULL); - - if (!filename) - (core_target->to_detach) (core_target, filename, from_tty); - else - (core_target->to_open) (filename, from_tty); -} /* If there are two or more functions that wish to hook into @@ -130,29 +104,24 @@ specify_exec_file_hook (void (*hook) (const char *)) void reopen_exec_file (void) { - char *filename; int res; struct stat st; - struct cleanup *cleanups; /* Don't do anything if there isn't an exec file. */ if (exec_bfd == NULL) return; /* If the timestamp of the exec file has changed, reopen it. */ - filename = xstrdup (bfd_get_filename (exec_bfd)); - cleanups = make_cleanup (xfree, filename); - res = stat (filename, &st); + std::string filename = bfd_get_filename (exec_bfd); + res = stat (filename.c_str (), &st); - if (exec_bfd_mtime && exec_bfd_mtime != st.st_mtime) - exec_file_attach (filename, 0); + if (res == 0 && exec_bfd_mtime && exec_bfd_mtime != st.st_mtime) + exec_file_attach (filename.c_str (), 0); else /* If we accessed the file since last opening it, close it now; this stops GDB from holding the executable open after it exits. */ bfd_cache_close_all (); - - do_cleanups (cleanups); } /* If we have both a core file and an exec file, @@ -170,11 +139,9 @@ validate_files (void) } } -/* Return the name of the executable file as a string. - ERR nonzero means get error if there is none specified; - otherwise return 0 in that case. */ +/* See gdbsupport/common-inferior.h. */ -char * +const char * get_exec_file (int err) { if (exec_filename) @@ -184,11 +151,10 @@ get_exec_file (int err) error (_("No executable file specified.\n\ Use the \"file\" or \"exec-file\" command.")); - return NULL; } -char * +std::string memory_error_message (enum target_xfer_status err, struct gdbarch *gdbarch, CORE_ADDR memaddr) { @@ -197,11 +163,11 @@ memory_error_message (enum target_xfer_status 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)); + return string_printf (_("Cannot access memory at address %s"), + paddress (gdbarch, memaddr)); case TARGET_XFER_UNAVAILABLE: - return xstrprintf (_("Memory at address %s unavailable."), - paddress (gdbarch, memaddr)); + return string_printf (_("Memory at address %s unavailable."), + paddress (gdbarch, memaddr)); default: internal_error (__FILE__, __LINE__, "unhandled target_xfer_status: %s (%s)", @@ -215,12 +181,10 @@ memory_error_message (enum target_xfer_status err, void memory_error (enum target_xfer_status err, CORE_ADDR memaddr) { - char *str; enum errors exception = GDB_NO_ERROR; /* Build error string. */ - str = memory_error_message (err, target_gdbarch (), memaddr); - make_cleanup (xfree, str); + std::string str = memory_error_message (err, target_gdbarch (), memaddr); /* Choose the right error to throw. */ switch (err) @@ -234,13 +198,14 @@ memory_error (enum target_xfer_status err, CORE_ADDR memaddr) } /* Throw it. */ - throw_error (exception, ("%s"), str); + throw_error (exception, ("%s"), str.c_str ()); } -/* Same as target_read_memory, but report an error if can't read. */ +/* Helper function. */ -void -read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) +static void +read_memory_object (enum target_object object, CORE_ADDR memaddr, + gdb_byte *myaddr, ssize_t len) { ULONGEST xfered = 0; @@ -249,8 +214,7 @@ read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) enum target_xfer_status status; ULONGEST xfered_len; - status = target_xfer_partial (current_target.beneath, - TARGET_OBJECT_MEMORY, NULL, + status = target_xfer_partial (current_top_target (), object, NULL, myaddr + xfered, NULL, memaddr + xfered, len - xfered, &xfered_len); @@ -264,16 +228,20 @@ read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) } } +/* Same as target_read_memory, but report an error if can't read. */ + +void +read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) +{ + read_memory_object (TARGET_OBJECT_MEMORY, memaddr, myaddr, len); +} + /* Same as target_read_stack, but report an error if can't read. */ void read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) { - int status; - - status = target_read_stack (memaddr, myaddr, len); - if (status != 0) - memory_error (status, memaddr); + read_memory_object (TARGET_OBJECT_STACK_MEMORY, memaddr, myaddr, len); } /* Same as target_read_code, but report an error if can't read. */ @@ -281,11 +249,7 @@ read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) void read_code (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) { - int status; - - status = target_read_code (memaddr, myaddr, len); - if (status != 0) - memory_error (status, memaddr); + read_memory_object (TARGET_OBJECT_CODE_MEMORY, memaddr, myaddr, len); } /* Read memory at MEMADDR of length LEN and put the contents in @@ -306,6 +270,24 @@ safe_read_memory_integer (CORE_ADDR memaddr, int len, return 1; } +/* Read memory at MEMADDR of length LEN and put the contents in + RETURN_VALUE. Return 0 if MEMADDR couldn't be read and non-zero + if successful. */ + +int +safe_read_memory_unsigned_integer (CORE_ADDR memaddr, int len, + enum bfd_endian byte_order, + ULONGEST *return_value) +{ + gdb_byte buf[sizeof (ULONGEST)]; + + if (target_read_memory (memaddr, buf, len)) + return 0; + + *return_value = extract_unsigned_integer (buf, len, byte_order); + return 1; +} + LONGEST read_memory_integer (CORE_ADDR memaddr, int len, enum bfd_endian byte_order) @@ -376,7 +358,7 @@ read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len) CORE_ADDR read_memory_typed_address (CORE_ADDR addr, struct type *type) { - gdb_byte *buf = alloca (TYPE_LENGTH (type)); + gdb_byte *buf = (gdb_byte *) alloca (TYPE_LENGTH (type)); read_memory (addr, buf, TYPE_LENGTH (type)); return extract_typed_address (buf, type); @@ -392,7 +374,7 @@ write_memory (CORE_ADDR memaddr, status = target_write_memory (memaddr, myaddr, len); if (status != 0) - memory_error (status, memaddr); + memory_error (TARGET_XFER_E_IO, memaddr); } /* Same as write_memory, but notify 'memory_changed' observers. */ @@ -402,7 +384,7 @@ write_memory_with_notification (CORE_ADDR memaddr, const bfd_byte *myaddr, ssize_t len) { write_memory (memaddr, myaddr, len); - observer_notify_memory_changed (current_inferior (), memaddr, len, myaddr); + gdb::observers::memory_changed.notify (current_inferior (), memaddr, len, myaddr); } /* Store VALUE at ADDR in the inferior as a LEN-byte unsigned @@ -412,7 +394,7 @@ write_memory_unsigned_integer (CORE_ADDR addr, int len, enum bfd_endian byte_order, ULONGEST value) { - gdb_byte *buf = alloca (len); + gdb_byte *buf = (gdb_byte *) alloca (len); store_unsigned_integer (buf, len, byte_order, value); write_memory (addr, buf, len); @@ -425,7 +407,7 @@ write_memory_signed_integer (CORE_ADDR addr, int len, enum bfd_endian byte_order, LONGEST value) { - gdb_byte *buf = alloca (len); + gdb_byte *buf = (gdb_byte *) alloca (len); store_signed_integer (buf, len, byte_order, value); write_memory (addr, buf, len); @@ -446,11 +428,8 @@ show_gnutarget_string (struct ui_file *file, int from_tty, _("The current BFD target is \"%s\".\n"), value); } -static void set_gnutarget_command (char *, int, - struct cmd_list_element *); - static void -set_gnutarget_command (char *ignore, int from_tty, +set_gnutarget_command (const char *ignore, int from_tty, struct cmd_list_element *c) { char *gend = gnutarget_string + strlen (gnutarget_string); @@ -466,8 +445,9 @@ set_gnutarget_command (char *ignore, int from_tty, /* A completion function for "set gnutarget". */ -static VEC (char_ptr) * +static void complete_set_gnutarget (struct cmd_list_element *cmd, + completion_tracker &tracker, const char *text, const char *word) { static const char **bfd_targets; @@ -480,17 +460,17 @@ complete_set_gnutarget (struct cmd_list_element *cmd, for (last = 0; bfd_targets[last] != NULL; ++last) ; - bfd_targets = xrealloc (bfd_targets, (last + 2) * sizeof (const char **)); + bfd_targets = XRESIZEVEC (const char *, bfd_targets, last + 2); bfd_targets[last] = "auto"; bfd_targets[last + 1] = NULL; } - return complete_on_enum (bfd_targets, text, word); + complete_on_enum (tracker, bfd_targets, text, word); } /* Set the gnutarget. */ void -set_gnutarget (char *newtarget) +set_gnutarget (const char *newtarget) { if (gnutarget_string != NULL) xfree (gnutarget_string); @@ -505,6 +485,7 @@ _initialize_core (void) c = add_cmd ("core-file", class_files, core_file_command, _("\ Use FILE as core dump for examining memory and registers.\n\ +Usage: core-file FILE\n\ No arg means have no core file. This command has been superseded by the\n\ `target core' and `detach' commands."), &cmdlist); set_cmd_completer (c, filename_completer);