convert to_trace_init

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e2a0e58850cc47d7e00eb841df3d70b1b058f80d..a26d35279608f6cb73cd61b4bed37b7d81f7ad34 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (update_current_target): Don't inherit or default
+       to_trace_init.
+       * target.h (struct target_ops) <to_trace_init>: Use
+       TARGET_DEFAULT_RETURN.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target-delegates.c: Rebuild.

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 275ce58ee07c0ad8ab9cddcaf6717e5f523370ca..6b0520992b2802a72a3f8c051f7cb40070775442 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -637,6 +637,19 @@ delegate_thread_architecture (struct target_ops *self, ptid_t arg1)
   return self->to_thread_architecture (self, arg1);
 }
 
+static void
+delegate_trace_init (struct target_ops *self)
+{
+  self = self->beneath;
+  self->to_trace_init (self);
+}
+
+static void
+tdefault_trace_init (struct target_ops *self)
+{
+  tcomplain ();
+}
+
 static int
 delegate_supports_btrace (struct target_ops *self)
 {
@@ -765,6 +778,8 @@ install_delegators (struct target_ops *ops)
     ops->to_supports_string_tracing = delegate_supports_string_tracing;
   if (ops->to_thread_architecture == NULL)
     ops->to_thread_architecture = delegate_thread_architecture;
+  if (ops->to_trace_init == NULL)
+    ops->to_trace_init = delegate_trace_init;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
 }
@@ -828,5 +843,6 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_supports_enable_disable_tracepoint = tdefault_supports_enable_disable_tracepoint;
   ops->to_supports_string_tracing = tdefault_supports_string_tracing;
   ops->to_thread_architecture = default_thread_architecture;
+  ops->to_trace_init = tdefault_trace_init;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }

diff --git a/gdb/target.c b/gdb/target.c
index c9e2ba59f39c69a7956907d043c99315014a9d6a..db4fed308dd748e457d3dd8bdcac792b51830adb 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -688,7 +688,7 @@ update_current_target (void)
       /* Do not inherit to_supports_multi_process.  */
       /* Do not inherit to_supports_enable_disable_tracepoint.  */
       /* Do not inherit to_supports_string_tracing.  */
-      INHERIT (to_trace_init, t);
+      /* Do not inherit to_trace_init.  */
       INHERIT (to_download_tracepoint, t);
       INHERIT (to_can_download_tracepoint, t);
       INHERIT (to_download_trace_state_variable, 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_trace_init,
-           (void (*) (struct target_ops *))
-           tcomplain);
   de_fault (to_download_tracepoint,
            (void (*) (struct target_ops *, struct bp_location *))
            tcomplain);

diff --git a/gdb/target.h b/gdb/target.h
index db31b5eaf6e634ae4c6b9075f67b99f466616e44..15ea4a8ad6415969277f82547bf88b32cf1733c1 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -801,7 +801,8 @@ struct target_ops
     /* Tracepoint-related operations.  */
 
     /* Prepare the target for a tracing run.  */
-    void (*to_trace_init) (struct target_ops *);
+    void (*to_trace_init) (struct target_ops *)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
 
     /* Send full details of a tracepoint location to the target.  */
     void (*to_download_tracepoint) (struct target_ops *,