diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-12-18 20:13:40 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:48:22 -0700 |
| commit | 170049d41c3cb8becb46e8e71a30f67f5d47d5ad (patch) | |
| tree | 1a0350bae260abc54f01d71492b5732b46a0f82e | |
| parent | 16fc27d65a74aa6bd524a0f7dc85cdd2caad496f (diff) | |
| download | gdb-170049d41c3cb8becb46e8e71a30f67f5d47d5ad.zip gdb-170049d41c3cb8becb46e8e71a30f67f5d47d5ad.tar.gz gdb-170049d41c3cb8becb46e8e71a30f67f5d47d5ad.tar.bz2 | |
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.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/target-delegates.c | 16 | ||||
| -rw-r--r-- | gdb/target.c | 11 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
4 files changed, 26 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a3d94a3..0a21412 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,6 +1,13 @@ 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. * target.c (target_call_history_from): Unconditionally delegate. * target.h (struct target_ops) <to_call_history_from>: Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index b30773f..5755146 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -1261,6 +1261,19 @@ tdefault_supports_btrace (struct target_ops *self) } 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) { self = self->beneath; @@ -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 3bd52a5..d2db18d 100644 --- 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 (¤t_target, size, flags); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index 05df9bb..9f7a3dc 100644 --- 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. |