diff options
| -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 584f6c1..a241251 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_insn_history): Unconditionally delegate. + * target.h (struct target_ops) <to_insn_history>: Use + TARGET_DEFAULT_NORETURN. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. * target.c (target_insn_history_from): Unconditionally delegate. * target.h (struct target_ops) <to_insn_history_from>: Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index be52f50..1963ccf 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_insn_history (struct target_ops *self, int arg1, int arg2) +{ + self = self->beneath; + self->to_insn_history (self, arg1, arg2); +} + +static void +tdefault_insn_history (struct target_ops *self, int arg1, int arg2) +{ + tcomplain (); +} + +static void delegate_insn_history_from (struct target_ops *self, ULONGEST arg1, int arg2, int arg3) { self = self->beneath; @@ -1553,6 +1566,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_insn_history == NULL) + ops->to_insn_history = delegate_insn_history; if (ops->to_insn_history_from == NULL) ops->to_insn_history_from = delegate_insn_history_from; if (ops->to_insn_history_range == NULL) @@ -1676,6 +1691,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_insn_history = tdefault_insn_history; ops->to_insn_history_from = tdefault_insn_history_from; ops->to_insn_history_range = tdefault_insn_history_range; ops->to_call_history = tdefault_call_history; diff --git a/gdb/target.c b/gdb/target.c index 453d7ad..ae57793 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -4012,16 +4012,7 @@ target_goto_record (ULONGEST insn) void target_insn_history (int size, int flags) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_insn_history != NULL) - { - t->to_insn_history (t, size, flags); - return; - } - - tcomplain (); + current_target.to_insn_history (¤t_target, size, flags); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index 73288cf..71062c9 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1047,7 +1047,8 @@ struct target_ops the current position. If SIZE < 0, disassemble abs (SIZE) preceding instructions; otherwise, disassemble SIZE succeeding instructions. */ - void (*to_insn_history) (struct target_ops *, int size, int flags); + void (*to_insn_history) (struct target_ops *, int size, int flags) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Disassemble SIZE instructions in the recorded execution trace around FROM. |