Add target_ops argument to to_goto_bookmark

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target.h (struct target_ops) <to_goto_bookmark>: Add argument.
	(target_goto_bookmark): Add argument.
	* target.c (dummy_goto_bookmark): Add 'self' argument.
	* record-full.c (record_full_goto_bookmark): Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cc6a3a431c6b3ed7eb552286eb983f61c7574008..b9edea7346bb724e79d9760b7d4ebdf0bf8099a3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_goto_bookmark>: Add argument.
+       (target_goto_bookmark): Add argument.
+       * target.c (dummy_goto_bookmark): Add 'self' argument.
+       * record-full.c (record_full_goto_bookmark): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_get_bookmark>: Add argument.

diff --git a/gdb/record-full.c b/gdb/record-full.c
index d51474167ba7f7f8ec3b415ac9c78c8847eb161d..649ae5c843bd222cd604585e9bb45a863991ed16 100644 (file)
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -1724,7 +1724,8 @@ record_full_get_bookmark (struct target_ops *self, char *args, int from_tty)
 /* "to_goto_bookmark" method for process record and prec over core.  */
 
 static void
-record_full_goto_bookmark (gdb_byte *raw_bookmark, int from_tty)
+record_full_goto_bookmark (struct target_ops *self,
+                          gdb_byte *raw_bookmark, int from_tty)
 {
   char *bookmark = (char *) raw_bookmark;
 

diff --git a/gdb/target.c b/gdb/target.c
index 74725f8d238b03f59b3266427a7b5d147bdcc288..4d67bc37ffb2cbe829989d08b64e42386f585d77 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3796,7 +3796,7 @@ dummy_get_bookmark (struct target_ops *self, char *ignore1, int ignore2)
 
 /* Error-catcher for target_goto_bookmark.  */
 static void
-dummy_goto_bookmark (gdb_byte *ignore, int from_tty)
+dummy_goto_bookmark (struct target_ops *self, gdb_byte *ignore, int from_tty)
 {
   tcomplain ();
 }

diff --git a/gdb/target.h b/gdb/target.h
index 732c2a9eaafa9612d0a8ea94fa845d7706c8ca7c..526ba521d5d88acb7c1d5ddd1103df638218e39c 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -554,7 +554,7 @@ struct target_ops
     /* get_bookmark support method for bookmarks */
     gdb_byte * (*to_get_bookmark) (struct target_ops *, char *, int);
     /* goto_bookmark support method for bookmarks */
-    void (*to_goto_bookmark) (gdb_byte *, int);
+    void (*to_goto_bookmark) (struct target_ops *, gdb_byte *, int);
     /* Return the thread-local address at OFFSET in the
        thread-local storage for the thread PTID and the shared library
        or executable file given by OBJFILE.  If that block of
@@ -1575,7 +1575,7 @@ extern char *target_thread_name (struct thread_info *);
      (current_target.to_get_bookmark) (&current_target, ARGS, FROM_TTY)
 
 #define target_goto_bookmark(ARG, FROM_TTY) \
-     (current_target.to_goto_bookmark) (ARG, FROM_TTY)
+     (current_target.to_goto_bookmark) (&current_target, ARG, FROM_TTY)
 
 /* Hardware watchpoint interfaces.  */