convert to_goto_bookmark

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

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_goto_bookmark.
	(dummy_goto_bookmark): Remove.
	(init_dummy_target): Don't inherit or default to_goto_bookmark.
	* target.h (struct target_ops) <to_goto_bookmark>: Use
	TARGET_DEFAULT_NORETURN.

4 files changed, 29 insertions, 10 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3528a4e..d68cd3f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,6 +2,16 @@
 
 	* target-delegates.c: Rebuild.
 	* target.c (update_current_target): Don't inherit or default
+	to_goto_bookmark.
+	(dummy_goto_bookmark): Remove.
+	(init_dummy_target): Don't inherit or default to_goto_bookmark.
+	* target.h (struct target_ops) <to_goto_bookmark>: Use
+	TARGET_DEFAULT_NORETURN.
+
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+	* target-delegates.c: Rebuild.
+	* target.c (update_current_target): Don't inherit or default
 	to_get_bookmark.
 	(dummy_get_bookmark): Remove.
 	(init_dummy_target): Don't inherit or default to_get_bookmark.
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 7d8878a..cb03f54 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -538,6 +538,19 @@ tdefault_get_bookmark (struct target_ops *self, char *arg1, int arg2)
   tcomplain ();
 }
 
+static void
+delegate_goto_bookmark (struct target_ops *self, gdb_byte *arg1, int arg2)
+{
+  self = self->beneath;
+  self->to_goto_bookmark (self, arg1, arg2);
+}
+
+static void
+tdefault_goto_bookmark (struct target_ops *self, gdb_byte *arg1, int arg2)
+{
+  tcomplain ();
+}
+
 static enum target_xfer_status 
 delegate_xfer_partial (struct target_ops *self, enum target_object  arg1, const char *arg2, gdb_byte *arg3, const gdb_byte *arg4, ULONGEST arg5, ULONGEST arg6, ULONGEST *arg7)
 {
@@ -661,6 +674,8 @@ install_delegators (struct target_ops *ops)
     ops->to_make_corefile_notes = delegate_make_corefile_notes;
   if (ops->to_get_bookmark == NULL)
     ops->to_get_bookmark = delegate_get_bookmark;
+  if (ops->to_goto_bookmark == NULL)
+    ops->to_goto_bookmark = delegate_goto_bookmark;
   if (ops->to_xfer_partial == NULL)
     ops->to_xfer_partial = delegate_xfer_partial;
   if (ops->to_supports_btrace == NULL)
@@ -717,6 +732,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_find_memory_regions = dummy_find_memory_regions;
   ops->to_make_corefile_notes = dummy_make_corefile_notes;
   ops->to_get_bookmark = tdefault_get_bookmark;
+  ops->to_goto_bookmark = tdefault_goto_bookmark;
   ops->to_xfer_partial = tdefault_xfer_partial;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }
diff --git a/gdb/target.c b/gdb/target.c
index 1218e4f..5aefda9 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -671,7 +671,7 @@ update_current_target (void)
       /* Do not inherit to_find_memory_regions.  */
       /* Do not inherit to_make_corefile_notes.  */
       /* Do not inherit to_get_bookmark.  */
-      INHERIT (to_goto_bookmark, t);
+      /* Do not inherit to_goto_bookmark.  */
       /* Do not inherit to_get_thread_local_address.  */
       INHERIT (to_can_execute_reverse, t);
       INHERIT (to_execution_direction, t);
@@ -3680,13 +3680,6 @@ dummy_make_corefile_notes (struct target_ops *self,
   return NULL;
 }
 
-/* Error-catcher for target_goto_bookmark.  */
-static void
-dummy_goto_bookmark (struct target_ops *self, gdb_byte *ignore, int from_tty)
-{
-  tcomplain ();
-}
-
 /* Set up the handful of non-empty slots needed by the dummy target
    vector.  */
 
@@ -3702,7 +3695,6 @@ init_dummy_target (void)
     = find_default_supports_disable_randomization;
   dummy_target.to_pid_to_str = dummy_pid_to_str;
   dummy_target.to_stratum = dummy_stratum;
-  dummy_target.to_goto_bookmark = dummy_goto_bookmark;
   dummy_target.to_has_all_memory = (int (*) (struct target_ops *)) return_zero;
   dummy_target.to_has_memory = (int (*) (struct target_ops *)) return_zero;
   dummy_target.to_has_stack = (int (*) (struct target_ops *)) return_zero;
diff --git a/gdb/target.h b/gdb/target.h
index 0fb7d8e..05a6b1a 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -591,7 +591,8 @@ struct target_ops
     gdb_byte * (*to_get_bookmark) (struct target_ops *, char *, int)
       TARGET_DEFAULT_NORETURN (tcomplain ());
     /* goto_bookmark support method for bookmarks */
-    void (*to_goto_bookmark) (struct target_ops *, gdb_byte *, int);
+    void (*to_goto_bookmark) (struct target_ops *, gdb_byte *, int)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
     /* 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