/* 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'.
static void
exec_reverse_once (const char *cmd, char *args, int from_tty)
{
- char *reverse_command;
enum exec_direction_kind dir = execution_direction;
- struct cleanup *old_chain;
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[0], from_tty);
}
static void
{
/* 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 = XCNEW (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
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)
{
if (bookmark_chain == NULL)
{
static int
bookmark_1 (int bnum)
{
- struct gdbarch *gdbarch = get_regcache_arch (get_current_regcache ());
+ struct gdbarch *gdbarch = get_current_regcache ()->arch ();
struct bookmark *b;
int matched = 0;
/* Implement "info bookmarks" command. */
static void
-bookmarks_info (char *args, int from_tty)
+info_bookmarks_command (char *args, int from_tty)
{
if (!bookmark_chain)
printf_filtered (_("No bookmarks.\n"));
}
}
-
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_reverse;
-
void
_initialize_reverse (void)
{
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\