From a134316b1f47741fadfc6d7c3c43acb43261246e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:31:42 -0700 Subject: [PATCH] convert to_ranged_break_num_registers 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_ranged_break_num_registers): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 8 +------- gdb/target.h | 3 ++- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1f352eaf688..1e001189b93 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_ranged_break_num_registers): Unconditionally + delegate. + * target.h (struct target_ops) : + Use TARGET_DEFAULT_RETURN. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index f813e35f329..3def7634c18 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -137,6 +137,19 @@ tdefault_can_use_hw_breakpoint (struct target_ops *self, int arg1, int arg2, int return 0; } +static int +delegate_ranged_break_num_registers (struct target_ops *self) +{ + self = self->beneath; + return self->to_ranged_break_num_registers (self); +} + +static int +tdefault_ranged_break_num_registers (struct target_ops *self) +{ + return -1; +} + static int delegate_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2) { @@ -1113,6 +1126,8 @@ install_delegators (struct target_ops *ops) ops->to_remove_breakpoint = delegate_remove_breakpoint; if (ops->to_can_use_hw_breakpoint == NULL) ops->to_can_use_hw_breakpoint = delegate_can_use_hw_breakpoint; + if (ops->to_ranged_break_num_registers == NULL) + ops->to_ranged_break_num_registers = delegate_ranged_break_num_registers; if (ops->to_insert_hw_breakpoint == NULL) ops->to_insert_hw_breakpoint = delegate_insert_hw_breakpoint; if (ops->to_remove_hw_breakpoint == NULL) @@ -1288,6 +1303,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_insert_breakpoint = memory_insert_breakpoint; ops->to_remove_breakpoint = memory_remove_breakpoint; ops->to_can_use_hw_breakpoint = tdefault_can_use_hw_breakpoint; + ops->to_ranged_break_num_registers = tdefault_ranged_break_num_registers; ops->to_insert_hw_breakpoint = tdefault_insert_hw_breakpoint; ops->to_remove_hw_breakpoint = tdefault_remove_hw_breakpoint; ops->to_remove_watchpoint = tdefault_remove_watchpoint; diff --git a/gdb/target.c b/gdb/target.c index f656db37173..d4e58b06bfe 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3899,13 +3899,7 @@ target_masked_watch_num_registers (CORE_ADDR addr, CORE_ADDR mask) int target_ranged_break_num_registers (void) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_ranged_break_num_registers != NULL) - return t->to_ranged_break_num_registers (t); - - return -1; + return current_target.to_ranged_break_num_registers (¤t_target); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index 0aee7a9d51d..25e98ed35b2 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -458,7 +458,8 @@ struct target_ops TARGET_DEFAULT_FUNC (memory_remove_breakpoint); int (*to_can_use_hw_breakpoint) (struct target_ops *, int, int, int) TARGET_DEFAULT_RETURN (0); - int (*to_ranged_break_num_registers) (struct target_ops *); + int (*to_ranged_break_num_registers) (struct target_ops *) + TARGET_DEFAULT_RETURN (-1); int (*to_insert_hw_breakpoint) (struct target_ops *, struct gdbarch *, struct bp_target_info *) TARGET_DEFAULT_RETURN (-1); -- 2.30.2