convert to_trace_set_readonly_regions

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 013e87836f6256074125f312ac797011acb8d706..f2c9efda076b5f6240397aa6d789bd62699369e3 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_set_readonly_regions.
+       * target.h (struct target_ops) <to_trace_set_readonly_regions>:
+       Use TARGET_DEFAULT_NORETURN.
+
 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 062424d29b63414e9071760dbdf61043df6e07da..14ebff18e2202093b015fc002f6978cb73e62f56 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -715,6 +715,19 @@ tdefault_disable_tracepoint (struct target_ops *self, struct bp_location *arg1)
   tcomplain ();
 }
 
+static void
+delegate_trace_set_readonly_regions (struct target_ops *self)
+{
+  self = self->beneath;
+  self->to_trace_set_readonly_regions (self);
+}
+
+static void
+tdefault_trace_set_readonly_regions (struct target_ops *self)
+{
+  tcomplain ();
+}
+
 static int
 delegate_supports_btrace (struct target_ops *self)
 {
@@ -855,6 +868,8 @@ install_delegators (struct target_ops *ops)
     ops->to_enable_tracepoint = delegate_enable_tracepoint;
   if (ops->to_disable_tracepoint == NULL)
     ops->to_disable_tracepoint = delegate_disable_tracepoint;
+  if (ops->to_trace_set_readonly_regions == NULL)
+    ops->to_trace_set_readonly_regions = delegate_trace_set_readonly_regions;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
 }
@@ -924,5 +939,6 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_download_trace_state_variable = tdefault_download_trace_state_variable;
   ops->to_enable_tracepoint = tdefault_enable_tracepoint;
   ops->to_disable_tracepoint = tdefault_disable_tracepoint;
+  ops->to_trace_set_readonly_regions = tdefault_trace_set_readonly_regions;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }

diff --git a/gdb/target.c b/gdb/target.c
index c337877c9972452fddb006ec2378d54ba8dc076a..0880cf138f0c7a743ce31685ec95602e777755d3 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -694,7 +694,7 @@ update_current_target (void)
       /* Do not inherit to_download_trace_state_variable.  */
       /* Do not inherit to_enable_tracepoint.  */
       /* Do not inherit to_disable_tracepoint.  */
-      INHERIT (to_trace_set_readonly_regions, t);
+      /* Do not inherit to_trace_set_readonly_regions.  */
       INHERIT (to_trace_start, t);
       INHERIT (to_get_trace_status, t);
       INHERIT (to_get_tracepoint_status, 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_set_readonly_regions,
-           (void (*) (struct target_ops *))
-           tcomplain);
   de_fault (to_trace_start,
            (void (*) (struct target_ops *))
            tcomplain);

diff --git a/gdb/target.h b/gdb/target.h
index 826bcb3f92a802d270f804e2cc7849c428d1b2cb..e5a75d0a381372c027af88a08a86ddac2aa7af08 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -832,7 +832,8 @@ struct target_ops
     /* Inform the target info of memory regions that are readonly
        (such as text sections), and so it should return data from
        those rather than look in the trace buffer.  */
-    void (*to_trace_set_readonly_regions) (struct target_ops *);
+    void (*to_trace_set_readonly_regions) (struct target_ops *)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
 
     /* Start a trace run.  */
     void (*to_trace_start) (struct target_ops *);