/* Reverse execution and reverse debugging.
- Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2006-2020 Free Software Foundation, Inc.
This file is part of GDB.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include "gdb_string.h"
#include "target.h"
#include "top.h"
#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
+#include "cli/cli-utils.h"
#include "inferior.h"
+#include "infrun.h"
#include "regcache.h"
/* User interface:
reverse-step, reverse-next etc. */
-static void
-exec_direction_default (void *notused)
-{
- /* Return execution direction to default state. */
- execution_direction = EXEC_FORWARD;
-}
-
/* exec_reverse_once -- accepts an arbitrary gdb command (string),
and executes it with exec-direction set to 'reverse'.
Used to implement reverse-next etc. commands. */
static void
-exec_reverse_once (char *cmd, char *args, int from_tty)
+exec_reverse_once (const char *cmd, const char *args, int from_tty)
{
- char *reverse_command;
enum exec_direction_kind dir = execution_direction;
- struct cleanup *old_chain;
-
- if (dir == EXEC_ERROR)
- error (_("Target %s does not support this command."), target_shortname);
if (dir == EXEC_REVERSE)
error (_("Already in reverse mode. Use '%s' or 'set exec-dir forward'."),
if (!target_can_execute_reverse)
error (_("Target %s does not support this command."), target_shortname);
- reverse_command = xstrprintf ("%s %s", cmd, args ? args : "");
- old_chain = make_cleanup (exec_direction_default, NULL);
- make_cleanup (xfree, reverse_command);
- execution_direction = EXEC_REVERSE;
- execute_command (reverse_command, from_tty);
- do_cleanups (old_chain);
+ std::string reverse_command = string_printf ("%s %s", cmd, args ? args : "");
+ scoped_restore restore_exec_dir
+ = make_scoped_restore (&execution_direction, EXEC_REVERSE);
+ execute_command (reverse_command.c_str (), from_tty);
}
static void
-reverse_step (char *args, int from_tty)
+reverse_step (const char *args, int from_tty)
{
exec_reverse_once ("step", args, from_tty);
}
static void
-reverse_stepi (char *args, int from_tty)
+reverse_stepi (const char *args, int from_tty)
{
exec_reverse_once ("stepi", args, from_tty);
}
static void
-reverse_next (char *args, int from_tty)
+reverse_next (const char *args, int from_tty)
{
exec_reverse_once ("next", args, from_tty);
}
static void
-reverse_nexti (char *args, int from_tty)
+reverse_nexti (const char *args, int from_tty)
{
exec_reverse_once ("nexti", args, from_tty);
}
static void
-reverse_continue (char *args, int from_tty)
+reverse_continue (const char *args, int from_tty)
{
exec_reverse_once ("continue", args, from_tty);
}
static void
-reverse_finish (char *args, int from_tty)
+reverse_finish (const char *args, int from_tty)
{
exec_reverse_once ("finish", args, from_tty);
}
Up to us to free it as required. */
static void
-save_bookmark_command (char *args, int from_tty)
+save_bookmark_command (const char *args, int from_tty)
{
/* Get target's idea of a bookmark. */
gdb_byte *bookmark_id = target_get_bookmark (args, from_tty);
- struct bookmark *b, *b1;
- struct gdbarch *gdbarch = get_regcache_arch (get_current_regcache ());
+ struct gdbarch *gdbarch = get_current_regcache ()->arch ();
/* CR should not cause another identical bookmark. */
dont_repeat ();
error (_("target_get_bookmark failed."));
/* Set up a bookmark struct. */
- b = xcalloc (1, sizeof (struct bookmark));
+ bookmark *b = new bookmark ();
b->number = ++bookmark_count;
- init_sal (&b->sal);
b->pc = regcache_read_pc (get_current_regcache ());
b->sal = find_pc_line (b->pc, 0);
b->sal.pspace = get_frame_program_space (get_current_frame ());
/* Add this bookmark to the end of the chain, so that a list
of bookmarks will come out in order of increasing numbers. */
- b1 = bookmark_chain;
+ bookmark *b1 = bookmark_chain;
if (b1 == 0)
bookmark_chain = b;
else
/* Implement "delete bookmark" command. */
static int
-delete_one_bookmark (struct bookmark *b)
+delete_one_bookmark (int num)
{
- struct bookmark *b1;
+ struct bookmark *b1, *b;
+
+ /* Find bookmark with corresponding number. */
+ ALL_BOOKMARKS (b)
+ if (b->number == num)
+ break;
/* Special case, first item in list. */
if (b == bookmark_chain)
bookmark_chain = b->next;
- /* Find bookmark preceeding "marked" one, so we can unlink. */
+ /* Find bookmark preceding "marked" one, so we can unlink. */
if (b)
{
ALL_BOOKMARKS (b1)
break;
}
xfree (b->opaque_data);
- xfree (b);
+ delete b;
return 1; /* success */
}
return 0; /* failure */
}
static void
-delete_bookmark_command (char *args, int from_tty)
+delete_bookmark_command (const char *args, int from_tty)
{
- struct bookmark *b;
- unsigned long num;
-
if (bookmark_chain == NULL)
{
warning (_("No bookmarks."));
return;
}
- num = strtoul (args, NULL, 0);
- /* Find bookmark with corresponding number. */
- ALL_BOOKMARKS (b)
- if (b->number == num)
- break;
-
- if (!delete_one_bookmark (b))
- /* Not found. */
- error (_("delete bookmark: no bookmark found for '%s'."), args);
+ number_or_range_parser parser (args);
+ while (!parser.finished ())
+ {
+ int num = parser.get_number ();
+ if (!delete_one_bookmark (num))
+ /* Not found. */
+ warning (_("No bookmark #%d."), num);
+ }
}
/* Implement "goto-bookmark" command. */
static void
-goto_bookmark_command (char *args, int from_tty)
+goto_bookmark_command (const char *args, int from_tty)
{
struct bookmark *b;
unsigned long num;
+ const char *p = args;
if (args == NULL || args[0] == '\0')
error (_("Command requires an argument."));
- if (strncmp (args, "start", strlen ("start")) == 0
- || strncmp (args, "begin", strlen ("begin")) == 0
- || strncmp (args, "end", strlen ("end")) == 0)
+ if (startswith (args, "start")
+ || startswith (args, "begin")
+ || startswith (args, "end"))
{
/* Special case. Give target opportunity to handle. */
- target_goto_bookmark (args, from_tty);
+ target_goto_bookmark ((gdb_byte *) args, from_tty);
return;
}
/* Special case -- quoted string. Pass on to target. */
if (args[strlen (args) - 1] != args[0])
error (_("Unbalanced quotes: %s"), args);
- target_goto_bookmark (args, from_tty);
+ target_goto_bookmark ((gdb_byte *) args, from_tty);
return;
}
/* General case. Bookmark identified by bookmark number. */
- num = strtoul (args, NULL, 0);
+ num = get_number (&args);
+
+ if (num == 0)
+ error (_("goto-bookmark: invalid bookmark number '%s'."), p);
+
ALL_BOOKMARKS (b)
if (b->number == num)
break;
return;
}
/* Not found. */
- error (_("goto-bookmark: no bookmark found for '%s'."), args);
+ error (_("goto-bookmark: no bookmark found for '%s'."), p);
}
-/* Implement "info bookmarks" command. */
-
-static void
-bookmarks_info (char *args, int from_tty)
+static int
+bookmark_1 (int bnum)
{
+ struct gdbarch *gdbarch = get_current_regcache ()->arch ();
struct bookmark *b;
- int bnum = -1;
- struct gdbarch *gdbarch;
+ int matched = 0;
- if (args)
- bnum = parse_and_eval_long (args);
+ ALL_BOOKMARKS (b)
+ {
+ if (bnum == -1 || bnum == b->number)
+ {
+ printf_filtered (" %d %s '%s'\n",
+ b->number,
+ paddress (gdbarch, b->pc),
+ b->opaque_data);
+ matched++;
+ }
+ }
+
+ if (bnum > 0 && matched == 0)
+ printf_filtered ("No bookmark #%d\n", bnum);
+
+ return matched;
+}
+/* Implement "info bookmarks" command. */
+
+static void
+info_bookmarks_command (const char *args, int from_tty)
+{
if (!bookmark_chain)
+ printf_filtered (_("No bookmarks.\n"));
+ else if (args == NULL || *args == '\0')
+ bookmark_1 (-1);
+ else
{
- printf_filtered (_("No bookmarks.\n"));
- return;
+ number_or_range_parser parser (args);
+ while (!parser.finished ())
+ {
+ int bnum = parser.get_number ();
+ bookmark_1 (bnum);
+ }
}
-
- gdbarch = get_regcache_arch (get_current_regcache ());
- printf_filtered (_("Bookmark Address Opaque\n"));
- printf_filtered (_(" ID Data\n"));
-
- ALL_BOOKMARKS (b)
- printf_filtered (" %d %s '%s'\n",
- b->number,
- paddress (gdbarch, b->pc),
- b->opaque_data);
}
-
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_reverse;
-
+void _initialize_reverse ();
void
-_initialize_reverse (void)
+_initialize_reverse ()
{
add_com ("reverse-step", class_run, reverse_step, _("\
Step program backward until it reaches the beginning of another source line.\n\
Argument N means do this N times (or till program stops for another reason).")
);
- add_com_alias ("rs", "reverse-step", class_alias, 1);
+ add_com_alias ("rs", "reverse-step", class_run, 1);
add_com ("reverse-next", class_run, reverse_next, _("\
Step program backward, proceeding through subroutine calls.\n\
when they do, the call is treated as one instruction.\n\
Argument N means do this N times (or till program stops for another reason).")
);
- add_com_alias ("rn", "reverse-next", class_alias, 1);
+ add_com_alias ("rn", "reverse-next", class_run, 1);
add_com ("reverse-stepi", class_run, reverse_stepi, _("\
Step backward exactly one instruction.\n\
Argument N means do this N times (or till program stops for another reason).")
);
- add_com_alias ("rsi", "reverse-stepi", class_alias, 0);
+ add_com_alias ("rsi", "reverse-stepi", class_run, 0);
add_com ("reverse-nexti", class_run, reverse_nexti, _("\
Step backward one instruction, but proceed through called subroutines.\n\
Argument N means do this N times (or till program stops for another reason).")
);
- add_com_alias ("rni", "reverse-nexti", class_alias, 0);
+ add_com_alias ("rni", "reverse-nexti", class_run, 0);
add_com ("reverse-continue", class_run, reverse_continue, _("\
Continue program being debugged but run it in reverse.\n\
If proceeding from breakpoint, a number N may be used as an argument,\n\
which means to set the ignore count of that breakpoint to N - 1 (so that\n\
the breakpoint won't break until the Nth time it is reached)."));
- add_com_alias ("rc", "reverse-continue", class_alias, 0);
+ add_com_alias ("rc", "reverse-continue", class_run, 0);
add_com ("reverse-finish", class_run, reverse_finish, _("\
Execute backward until just before selected stack frame is called."));
Set a bookmark in the program's execution history.\n\
A bookmark represents a point in the execution history \n\
that can be returned to at a later point in the debug session."));
- add_info ("bookmarks", bookmarks_info, _("\
+ add_info ("bookmarks", info_bookmarks_command, _("\
Status of user-settable bookmarks.\n\
Bookmarks are user-settable markers representing a point in the \n\
execution history that can be returned to later in the same debug \n\
session."));
add_cmd ("bookmark", class_bookmark, delete_bookmark_command, _("\
Delete a bookmark from the bookmark list.\n\
-Argument is a bookmark number, or no argument to delete all bookmarks.\n"),
+Argument is a bookmark number or numbers,\n\
+ or no argument to delete all bookmarks."),
&deletelist);
add_com ("goto-bookmark", class_bookmark, goto_bookmark_command, _("\
Go to an earlier-bookmarked point in the program's execution history.\n\
Argument is the bookmark number of a bookmark saved earlier by using \n\
the 'bookmark' command, or the special arguments:\n\
start (beginning of recording)\n\
- end (end of recording)\n"));
+ end (end of recording)"));
}
projects / deliverable / binutils-gdb.git / blobdiff