espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-29 08:24:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

convert to_remove_hw_breakpoint

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

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_remove_hw_breakpoint.
	* target.h (struct target_ops) <to_remove_hw_breakpoint>: Use
	TARGET_DEFAULT_RETURN.
This commit is contained in:
Tom Tromey
2013-12-18 10:05:18 -07:00
parent 61b371f944
commit 418dabacd2
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -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_remove_hw_breakpoint.
* target.h (struct target_ops) <to_remove_hw_breakpoint>: Use
TARGET_DEFAULT_RETURN.
2014-02-19 Tom Tromey <tromey@redhat.com> 2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild. * target-delegates.c: Rebuild.

16
gdb/target-delegates.c
View File

@ -138,6 +138,19 @@ tdefault_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *arg1, st
return -1; return -1;
} }
static int
delegate_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2)
{
self = self->beneath;
return self->to_remove_hw_breakpoint (self, arg1, arg2);
}
static int
tdefault_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2)
{
return -1;
}
static int static int
delegate_stopped_by_watchpoint (struct target_ops *self) delegate_stopped_by_watchpoint (struct target_ops *self)
{ {
@ -251,6 +264,8 @@ install_delegators (struct target_ops *ops)
ops->to_can_use_hw_breakpoint = delegate_can_use_hw_breakpoint; ops->to_can_use_hw_breakpoint = delegate_can_use_hw_breakpoint;
if (ops->to_insert_hw_breakpoint == NULL) if (ops->to_insert_hw_breakpoint == NULL)
ops->to_insert_hw_breakpoint = delegate_insert_hw_breakpoint; ops->to_insert_hw_breakpoint = delegate_insert_hw_breakpoint;
if (ops->to_remove_hw_breakpoint == NULL)
ops->to_remove_hw_breakpoint = delegate_remove_hw_breakpoint;
if (ops->to_stopped_by_watchpoint == NULL) if (ops->to_stopped_by_watchpoint == NULL)
ops->to_stopped_by_watchpoint = delegate_stopped_by_watchpoint; ops->to_stopped_by_watchpoint = delegate_stopped_by_watchpoint;
if (ops->to_stopped_data_address == NULL) if (ops->to_stopped_data_address == NULL)
@ -284,6 +299,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_remove_breakpoint = memory_remove_breakpoint; ops->to_remove_breakpoint = memory_remove_breakpoint;
ops->to_can_use_hw_breakpoint = tdefault_can_use_hw_breakpoint; ops->to_can_use_hw_breakpoint = tdefault_can_use_hw_breakpoint;
ops->to_insert_hw_breakpoint = tdefault_insert_hw_breakpoint; ops->to_insert_hw_breakpoint = tdefault_insert_hw_breakpoint;
ops->to_remove_hw_breakpoint = tdefault_remove_hw_breakpoint;
ops->to_stopped_by_watchpoint = tdefault_stopped_by_watchpoint; ops->to_stopped_by_watchpoint = tdefault_stopped_by_watchpoint;
ops->to_stopped_data_address = tdefault_stopped_data_address; ops->to_stopped_data_address = tdefault_stopped_data_address;
ops->to_rcmd = default_rcmd; ops->to_rcmd = default_rcmd;

6
gdb/target.c
View File

@ -606,7 +606,7 @@ update_current_target (void)
/* Do not inherit to_remove_breakpoint. */ /* Do not inherit to_remove_breakpoint. */
/* Do not inherit to_can_use_hw_breakpoint. */ /* Do not inherit to_can_use_hw_breakpoint. */
/* Do not inherit to_insert_hw_breakpoint. */ /* Do not inherit to_insert_hw_breakpoint. */
INHERIT (to_remove_hw_breakpoint, t); /* Do not inherit to_remove_hw_breakpoint. */
/* Do not inherit to_ranged_break_num_registers. */ /* Do not inherit to_ranged_break_num_registers. */
INHERIT (to_insert_watchpoint, t); INHERIT (to_insert_watchpoint, t);
INHERIT (to_remove_watchpoint, t); INHERIT (to_remove_watchpoint, t);
@ -734,10 +734,6 @@ update_current_target (void)
(int (*) (CORE_ADDR, gdb_byte *, int, int, (int (*) (CORE_ADDR, gdb_byte *, int, int,
struct mem_attrib *, struct target_ops *)) struct mem_attrib *, struct target_ops *))
nomemory); nomemory);
de_fault (to_remove_hw_breakpoint,
(int (*) (struct target_ops *, struct gdbarch *,
struct bp_target_info *))
return_minus_one);
de_fault (to_insert_watchpoint, de_fault (to_insert_watchpoint,
(int (*) (struct target_ops *, CORE_ADDR, int, int, (int (*) (struct target_ops *, CORE_ADDR, int, int,
struct expression *)) struct expression *))

3
gdb/target.h
View File

@ -462,7 +462,8 @@ struct target_ops
struct gdbarch *, struct bp_target_info *) struct gdbarch *, struct bp_target_info *)
TARGET_DEFAULT_RETURN (-1); TARGET_DEFAULT_RETURN (-1);
int (*to_remove_hw_breakpoint) (struct target_ops *, int (*to_remove_hw_breakpoint) (struct target_ops *,
struct gdbarch *, struct bp_target_info *); struct gdbarch *, struct bp_target_info *)
TARGET_DEFAULT_RETURN (-1);
/* Documentation of what the two routines below are expected to do is /* Documentation of what the two routines below are expected to do is
provided with the corresponding target_* macros. */ provided with the corresponding target_* macros. */