convert to_use_agent

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 384faad7ce5b78679d7f88e15592c73fcafa1e0f..7289c28c9d1214e688cb12a9da81c6f0d4bbea0f 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_use_agent.
+       * target.h (struct target_ops) <to_use_agent>: 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 a06a8e5f45e67dc67cfc0810fab9b2916b189d08..204b91ec7e34ad708174f0e0b87ea132f766285e 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -984,6 +984,19 @@ tdefault_traceframe_info (struct target_ops *self)
   return 0;
 }
 
+static int
+delegate_use_agent (struct target_ops *self, int arg1)
+{
+  self = self->beneath;
+  return self->to_use_agent (self, arg1);
+}
+
+static int
+tdefault_use_agent (struct target_ops *self, int arg1)
+{
+  tcomplain ();
+}
+
 static int
 delegate_supports_btrace (struct target_ops *self)
 {
@@ -1166,6 +1179,8 @@ install_delegators (struct target_ops *ops)
     ops->to_static_tracepoint_markers_by_strid = delegate_static_tracepoint_markers_by_strid;
   if (ops->to_traceframe_info == NULL)
     ops->to_traceframe_info = delegate_traceframe_info;
+  if (ops->to_use_agent == NULL)
+    ops->to_use_agent = delegate_use_agent;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
 }
@@ -1256,5 +1271,6 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_static_tracepoint_marker_at = tdefault_static_tracepoint_marker_at;
   ops->to_static_tracepoint_markers_by_strid = tdefault_static_tracepoint_markers_by_strid;
   ops->to_traceframe_info = tdefault_traceframe_info;
+  ops->to_use_agent = tdefault_use_agent;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }

diff --git a/gdb/target.c b/gdb/target.c
index 2b4f2aa1849cf710f199e8ad099a77f6ba2996a0..a11cc9117221ddd82d8b70957f70f6f95f58f83e 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -711,7 +711,7 @@ update_current_target (void)
       /* Do not inherit to_static_tracepoint_marker_at.  */
       /* Do not inherit to_static_tracepoint_markers_by_strid.  */
       /* Do not inherit to_traceframe_info.  */
-      INHERIT (to_use_agent, t);
+      /* Do not inherit to_use_agent.  */
       INHERIT (to_can_use_agent, t);
       INHERIT (to_augmented_libraries_svr4_read, t);
       INHERIT (to_magic, t);
@@ -754,9 +754,6 @@ update_current_target (void)
   de_fault (to_can_run_breakpoint_commands,
            (int (*) (struct target_ops *))
            return_zero);
-  de_fault (to_use_agent,
-           (int (*) (struct target_ops *, int))
-           tcomplain);
   de_fault (to_can_use_agent,
            (int (*) (struct target_ops *))
            return_zero);

diff --git a/gdb/target.h b/gdb/target.h
index a8c982e69ddc0f613ad35343bd5580ff12915ea1..4cc20cfde740b3d00de5b435e687719befed835b 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -963,7 +963,8 @@ struct target_ops
 
     /* Ask the target to use or not to use agent according to USE.  Return 1
        successful, 0 otherwise.  */
-    int (*to_use_agent) (struct target_ops *, int use);
+    int (*to_use_agent) (struct target_ops *, int use)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
 
     /* Is the target able to use agent in current state?  */
     int (*to_can_use_agent) (struct target_ops *);