convert to_set_circular_trace_buffer

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 31219b6774952fad0e703584a963567b75947287..179ac4b6d5fd39e58ed36ca20dfcdc116e1dff05 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_set_circular_trace_buffer.
+       * target.h (struct target_ops) <to_set_circular_trace_buffer>: Use
+       TARGET_DEFAULT_IGNORE.
+
 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 d82b4bf8babf1ffb0c46ee892ec88b8a5ee97530..6fb242a939da04cdc3ca8739c5d6d733de2be4a3 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -883,6 +883,18 @@ tdefault_set_disconnected_tracing (struct target_ops *self, int arg1)
 {
 }
 
+static void
+delegate_set_circular_trace_buffer (struct target_ops *self, int arg1)
+{
+  self = self->beneath;
+  self->to_set_circular_trace_buffer (self, arg1);
+}
+
+static void
+tdefault_set_circular_trace_buffer (struct target_ops *self, int arg1)
+{
+}
+
 static int
 delegate_supports_btrace (struct target_ops *self)
 {
@@ -1049,6 +1061,8 @@ install_delegators (struct target_ops *ops)
     ops->to_get_min_fast_tracepoint_insn_len = delegate_get_min_fast_tracepoint_insn_len;
   if (ops->to_set_disconnected_tracing == NULL)
     ops->to_set_disconnected_tracing = delegate_set_disconnected_tracing;
+  if (ops->to_set_circular_trace_buffer == NULL)
+    ops->to_set_circular_trace_buffer = delegate_set_circular_trace_buffer;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
 }
@@ -1131,5 +1145,6 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_get_raw_trace_data = tdefault_get_raw_trace_data;
   ops->to_get_min_fast_tracepoint_insn_len = tdefault_get_min_fast_tracepoint_insn_len;
   ops->to_set_disconnected_tracing = tdefault_set_disconnected_tracing;
+  ops->to_set_circular_trace_buffer = tdefault_set_circular_trace_buffer;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }

diff --git a/gdb/target.c b/gdb/target.c
index e6ba817dc5c00f1f172142a78d2d7cd7d0ad12a2..96135aeabed097066d3af8791dc2c5c96a018bcb 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -705,7 +705,7 @@ update_current_target (void)
       /* Do not inherit to_get_raw_trace_data.  */
       /* Do not inherit to_get_min_fast_tracepoint_insn_len.  */
       /* Do not inherit to_set_disconnected_tracing.  */
-      INHERIT (to_set_circular_trace_buffer, t);
+      /* Do not inherit to_set_circular_trace_buffer.  */
       INHERIT (to_set_trace_buffer_size, t);
       INHERIT (to_set_trace_notes, t);
       INHERIT (to_get_tib_address, t);
@@ -750,9 +750,6 @@ update_current_target (void)
            (void (*) (struct target_ops *, ptid_t))
            target_ignore);
   current_target.to_read_description = NULL;
-  de_fault (to_set_circular_trace_buffer,
-           (void (*) (struct target_ops *, int))
-           target_ignore);
   de_fault (to_set_trace_buffer_size,
            (void (*) (struct target_ops *, LONGEST))
            target_ignore);

diff --git a/gdb/target.h b/gdb/target.h
index 91d0c34f1ff04551d78af211ad1966417b5e7968..c1952956772b9cb2fa108b981f027bc52099c5b7 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -895,7 +895,8 @@ struct target_ops
        disconnection - set VAL to 1 to keep tracing, 0 to stop.  */
     void (*to_set_disconnected_tracing) (struct target_ops *, int val)
       TARGET_DEFAULT_IGNORE ();
-    void (*to_set_circular_trace_buffer) (struct target_ops *, int val);
+    void (*to_set_circular_trace_buffer) (struct target_ops *, int val)
+      TARGET_DEFAULT_IGNORE ();
     /* Set the size of trace buffer in the target.  */
     void (*to_set_trace_buffer_size) (struct target_ops *, LONGEST val);