Add target_ops argument to to_get_bookmark

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

	* target.h (struct target_ops) <to_get_bookmark>: Add argument.
	(target_get_bookmark): Add argument.
	* target.c (dummy_get_bookmark): Add 'self' argument.
	* record-full.c (record_full_get_bookmark): Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d0550f09e1de873f661becaa9bcfb9a2d27cf8e..cc6a3a431c6b3ed7eb552286eb983f61c7574008 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_get_bookmark>: Add argument.
+       (target_get_bookmark): Add argument.
+       * target.c (dummy_get_bookmark): Add 'self' argument.
+       * record-full.c (record_full_get_bookmark): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_make_corefile_notes>: Add

diff --git a/gdb/record-full.c b/gdb/record-full.c
index 04ba714d11e1a975584aae954cd460530965ce91..d51474167ba7f7f8ec3b415ac9c78c8847eb161d 100644 (file)
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -1701,7 +1701,7 @@ record_full_can_execute_reverse (void)
 /* "to_get_bookmark" method for process record and prec over core.  */
 
 static gdb_byte *
-record_full_get_bookmark (char *args, int from_tty)
+record_full_get_bookmark (struct target_ops *self, char *args, int from_tty)
 {
   char *ret = NULL;
 

diff --git a/gdb/target.c b/gdb/target.c
index 4d193c9abb7352f39b3af6d85d5d0e3468178e4c..74725f8d238b03f59b3266427a7b5d147bdcc288 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3788,7 +3788,7 @@ dummy_make_corefile_notes (struct target_ops *self,
 
 /* Error-catcher for target_get_bookmark.  */
 static gdb_byte *
-dummy_get_bookmark (char *ignore1, int ignore2)
+dummy_get_bookmark (struct target_ops *self, char *ignore1, int ignore2)
 {
   tcomplain ();
   return NULL;

diff --git a/gdb/target.h b/gdb/target.h
index 7faf059624dce6f941dc1cf2623cdfe033d18eac..732c2a9eaafa9612d0a8ea94fa845d7706c8ca7c 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -552,7 +552,7 @@ struct target_ops
     /* make_corefile_notes support method for gcore */
     char * (*to_make_corefile_notes) (struct target_ops *, bfd *, int *);
     /* get_bookmark support method for bookmarks */
-    gdb_byte * (*to_get_bookmark) (char *, int);
+    gdb_byte * (*to_get_bookmark) (struct target_ops *, char *, int);
     /* goto_bookmark support method for bookmarks */
     void (*to_goto_bookmark) (gdb_byte *, int);
     /* Return the thread-local address at OFFSET in the
@@ -1572,7 +1572,7 @@ extern char *target_thread_name (struct thread_info *);
 
 /* Bookmark interfaces.  */
 #define target_get_bookmark(ARGS, FROM_TTY) \
-     (current_target.to_get_bookmark) (ARGS, FROM_TTY)
+     (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)