convert to_save_trace_data

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

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

4 files changed, 27 insertions, 5 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44b1a96..987d8b2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,6 +2,14 @@
 
 	* target-delegates.c: Rebuild.
 	* target.c (update_current_target): Don't inherit or default
+	to_save_trace_data.
+	* target.h (struct target_ops) <to_save_trace_data>: 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_trace_state_variable_value.
 	* target.h (struct target_ops)
 	<to_get_trace_state_variable_value>: Use TARGET_DEFAULT_RETURN.
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 4c934e7..a1844d8 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -807,6 +807,19 @@ tdefault_get_trace_state_variable_value (struct target_ops *self, int arg1, LONG
 }
 
 static int
+delegate_save_trace_data (struct target_ops *self, const char *arg1)
+{
+  self = self->beneath;
+  return self->to_save_trace_data (self, arg1);
+}
+
+static int
+tdefault_save_trace_data (struct target_ops *self, const char *arg1)
+{
+  tcomplain ();
+}
+
+static int
 delegate_supports_btrace (struct target_ops *self)
 {
   self = self->beneath;
@@ -960,6 +973,8 @@ install_delegators (struct target_ops *ops)
     ops->to_trace_find = delegate_trace_find;
   if (ops->to_get_trace_state_variable_value == NULL)
     ops->to_get_trace_state_variable_value = delegate_get_trace_state_variable_value;
+  if (ops->to_save_trace_data == NULL)
+    ops->to_save_trace_data = delegate_save_trace_data;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
 }
@@ -1036,5 +1051,6 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_trace_stop = tdefault_trace_stop;
   ops->to_trace_find = tdefault_trace_find;
   ops->to_get_trace_state_variable_value = tdefault_get_trace_state_variable_value;
+  ops->to_save_trace_data = tdefault_save_trace_data;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }
diff --git a/gdb/target.c b/gdb/target.c
index f0309f1..44900ed 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -701,7 +701,7 @@ update_current_target (void)
       /* Do not inherit to_trace_stop.  */
       /* Do not inherit to_trace_find.  */
       /* Do not inherit to_get_trace_state_variable_value.  */
-      INHERIT (to_save_trace_data, t);
+      /* Do not inherit to_save_trace_data.  */
       INHERIT (to_upload_tracepoints, t);
       INHERIT (to_upload_trace_state_variables, t);
       INHERIT (to_get_raw_trace_data, t);
@@ -752,9 +752,6 @@ update_current_target (void)
 	    (void (*) (struct target_ops *, ptid_t))
 	    target_ignore);
   current_target.to_read_description = NULL;
-  de_fault (to_save_trace_data,
-	    (int (*) (struct target_ops *, const char *))
-	    tcomplain);
   de_fault (to_upload_tracepoints,
 	    (int (*) (struct target_ops *, struct uploaded_tp **))
 	    return_zero);
diff --git a/gdb/target.h b/gdb/target.h
index 4331b91..9a7f3e4 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -869,7 +869,8 @@ struct target_ops
 					      int tsv, LONGEST *val)
       TARGET_DEFAULT_RETURN (0);
 
-    int (*to_save_trace_data) (struct target_ops *, const char *filename);
+    int (*to_save_trace_data) (struct target_ops *, const char *filename)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
 
     int (*to_upload_tracepoints) (struct target_ops *,
 				  struct uploaded_tp **utpp);