convert to_supports_enable_disable_tracepoint

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 73ffdf89dfdade4c69bda5f9b86ae4135fd0d062..13f4a7d452510c3ac34b9d275114e35b5e516ecf 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (update_current_target): Don't inherit or default
+       to_supports_enable_disable_tracepoint.
+       * target.h (struct target_ops)
+       <to_supports_enable_disable_tracepoint>: 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 3a322c11fe897e3002a9590a79b940b408172b0d..30bea1c1b8cc58c5e50fb8708daf68596fb33c9d 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -604,6 +604,19 @@ tdefault_supports_multi_process (struct target_ops *self)
   return 0;
 }
 
+static int
+delegate_supports_enable_disable_tracepoint (struct target_ops *self)
+{
+  self = self->beneath;
+  return self->to_supports_enable_disable_tracepoint (self);
+}
+
+static int
+tdefault_supports_enable_disable_tracepoint (struct target_ops *self)
+{
+  return 0;
+}
+
 static struct gdbarch *
 delegate_thread_architecture (struct target_ops *self, ptid_t arg1)
 {
@@ -733,6 +746,8 @@ install_delegators (struct target_ops *ops)
     ops->to_execution_direction = delegate_execution_direction;
   if (ops->to_supports_multi_process == NULL)
     ops->to_supports_multi_process = delegate_supports_multi_process;
+  if (ops->to_supports_enable_disable_tracepoint == NULL)
+    ops->to_supports_enable_disable_tracepoint = delegate_supports_enable_disable_tracepoint;
   if (ops->to_thread_architecture == NULL)
     ops->to_thread_architecture = delegate_thread_architecture;
   if (ops->to_supports_btrace == NULL)
@@ -795,6 +810,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_can_execute_reverse = tdefault_can_execute_reverse;
   ops->to_execution_direction = default_execution_direction;
   ops->to_supports_multi_process = tdefault_supports_multi_process;
+  ops->to_supports_enable_disable_tracepoint = tdefault_supports_enable_disable_tracepoint;
   ops->to_thread_architecture = default_thread_architecture;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }

diff --git a/gdb/target.c b/gdb/target.c
index bfa36350f2a691e958068d78c742ceca7832dc37..7d96806fa7109346864d1b7966b99f34973caf4f 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -686,7 +686,7 @@ update_current_target (void)
       /* Do not inherit to_get_ada_task_ptid.  */
       /* Do not inherit to_search_memory.  */
       /* Do not inherit to_supports_multi_process.  */
-      INHERIT (to_supports_enable_disable_tracepoint, t);
+      /* Do not inherit to_supports_enable_disable_tracepoint.  */
       INHERIT (to_supports_string_tracing, t);
       INHERIT (to_trace_init, t);
       INHERIT (to_download_tracepoint, 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_supports_enable_disable_tracepoint,
-           (int (*) (struct target_ops *))
-           return_zero);
   de_fault (to_supports_string_tracing,
            (int (*) (struct target_ops *))
            return_zero);

diff --git a/gdb/target.h b/gdb/target.h
index 390201d598c41f8609a629dcb46142dedba0d650..5fb7defe89db083178658255db4d714e6fc40443 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -718,7 +718,8 @@ struct target_ops
 
     /* Does this target support enabling and disabling tracepoints while a trace
        experiment is running?  */
-    int (*to_supports_enable_disable_tracepoint) (struct target_ops *);
+    int (*to_supports_enable_disable_tracepoint) (struct target_ops *)
+      TARGET_DEFAULT_RETURN (0);
 
     /* Does this target support disabling address space randomization?  */
     int (*to_supports_disable_randomization) (struct target_ops *);