convert to_call_history

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

	* target-delegates.c: Rebuild.
	* target.c (target_call_history): Unconditionally delegate.
	* target.h (struct target_ops) <to_call_history>: Use
	TARGET_DEFAULT_NORETURN.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a3d94a34c35d2e2c95cbdf90ef35e8e22bedd40f..0a214127af63c8d9f350228122c642c3baa967be 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (target_call_history): Unconditionally delegate.
+       * target.h (struct target_ops) <to_call_history>: 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 b30773f8605788d2431c6c7c5f17e85bb89a2b05..5755146da923f2d217e7070921527a8f2b6f7f66 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -1260,6 +1260,19 @@ tdefault_supports_btrace (struct target_ops *self)
   return 0;
 }
 
+static void
+delegate_call_history (struct target_ops *self, int arg1, int arg2)
+{
+  self = self->beneath;
+  self->to_call_history (self, arg1, arg2);
+}
+
+static void
+tdefault_call_history (struct target_ops *self, int arg1, int arg2)
+{
+  tcomplain ();
+}
+
 static void
 delegate_call_history_from (struct target_ops *self, ULONGEST arg1, int arg2, int arg3)
 {
@@ -1514,6 +1527,8 @@ install_delegators (struct target_ops *ops)
     ops->to_can_use_agent = delegate_can_use_agent;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
+  if (ops->to_call_history == NULL)
+    ops->to_call_history = delegate_call_history;
   if (ops->to_call_history_from == NULL)
     ops->to_call_history_from = delegate_call_history_from;
   if (ops->to_call_history_range == NULL)
@@ -1631,6 +1646,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_use_agent = tdefault_use_agent;
   ops->to_can_use_agent = tdefault_can_use_agent;
   ops->to_supports_btrace = tdefault_supports_btrace;
+  ops->to_call_history = tdefault_call_history;
   ops->to_call_history_from = tdefault_call_history_from;
   ops->to_call_history_range = tdefault_call_history_range;
   ops->to_augmented_libraries_svr4_read = tdefault_augmented_libraries_svr4_read;

diff --git a/gdb/target.c b/gdb/target.c
index 3bd52a51d9f8ffbcc993d511a0b197633f12f952..d2db18db8cb896f10776f019afd52c8bc702f49c 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -4063,16 +4063,7 @@ target_insn_history_range (ULONGEST begin, ULONGEST end, int flags)
 void
 target_call_history (int size, int flags)
 {
-  struct target_ops *t;
-
-  for (t = current_target.beneath; t != NULL; t = t->beneath)
-    if (t->to_call_history != NULL)
-      {
-       t->to_call_history (t, size, flags);
-       return;
-      }
-
-  tcomplain ();
+  current_target.to_call_history (&current_target, size, flags);
 }
 
 /* See target.h.  */

diff --git a/gdb/target.h b/gdb/target.h
index 05df9bb4cf2e2adced910a12b7697fd1e8122810..9f7a3dc8550396dd4d3f403b6095a53aa9d64f38 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -1064,7 +1064,8 @@ struct target_ops
     /* Print a function trace of the recorded execution trace.
        If SIZE < 0, print abs (SIZE) preceding functions; otherwise, print SIZE
        succeeding functions.  */
-    void (*to_call_history) (struct target_ops *, int size, int flags);
+    void (*to_call_history) (struct target_ops *, int size, int flags)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
 
     /* Print a function trace of the recorded execution trace starting
        at function FROM.