OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

convert to_watchpoint_addr_within_range 

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

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_watchpoint_addr_within_range.
	* target.h (struct target_ops) <to_watchpoint_addr_within_range>:
	Use TARGET_DEFAULT_FUNC.
This commit is contained in:
Tom Tromey 2013-12-18 10:15:23 -07:00
parent 61dd109f60
commit 65f160a9b3
4 changed files with 21 additions and 4 deletions
Show Stats 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_watchpoint_addr_within_range.
* target.h (struct target_ops) <to_watchpoint_addr_within_range>:
Use TARGET_DEFAULT_FUNC.
2014-02-19 Tom Tromey <tromey@redhat.com> 2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild. * target-delegates.c: Rebuild.

10
gdb/target-delegates.c
View File

@ -203,6 +203,13 @@ tdefault_stopped_data_address (struct target_ops *self, CORE_ADDR *arg1)
return 0; return 0;
} }
static int
delegate_watchpoint_addr_within_range (struct target_ops *self, CORE_ADDR arg1, CORE_ADDR arg2, int arg3)
{
self = self->beneath;
return self->to_watchpoint_addr_within_range (self, arg1, arg2, arg3);
}
static void static void
delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
{ {
@ -300,6 +307,8 @@ install_delegators (struct target_ops *ops)
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)
ops->to_stopped_data_address = delegate_stopped_data_address; ops->to_stopped_data_address = delegate_stopped_data_address;
if (ops->to_watchpoint_addr_within_range == NULL)
ops->to_watchpoint_addr_within_range = delegate_watchpoint_addr_within_range;
if (ops->to_rcmd == NULL) if (ops->to_rcmd == NULL)
ops->to_rcmd = delegate_rcmd; ops->to_rcmd = delegate_rcmd;
if (ops->to_can_async_p == NULL) if (ops->to_can_async_p == NULL)
@ -334,6 +343,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_insert_watchpoint = tdefault_insert_watchpoint; ops->to_insert_watchpoint = tdefault_insert_watchpoint;
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_watchpoint_addr_within_range = default_watchpoint_addr_within_range;
ops->to_rcmd = default_rcmd; ops->to_rcmd = default_rcmd;
ops->to_can_async_p = find_default_can_async_p; ops->to_can_async_p = find_default_can_async_p;
ops->to_is_async_p = find_default_is_async_p; ops->to_is_async_p = find_default_is_async_p;

4
gdb/target.c
View File

@ -616,7 +616,7 @@ update_current_target (void)
INHERIT (to_have_steppable_watchpoint, t); INHERIT (to_have_steppable_watchpoint, t);
INHERIT (to_have_continuable_watchpoint, t); INHERIT (to_have_continuable_watchpoint, t);
/* Do not inherit to_stopped_by_watchpoint. */ /* Do not inherit to_stopped_by_watchpoint. */
INHERIT (to_watchpoint_addr_within_range, t); /* Do not inherit to_watchpoint_addr_within_range. */
INHERIT (to_region_ok_for_hw_watchpoint, t); INHERIT (to_region_ok_for_hw_watchpoint, t);
INHERIT (to_can_accel_watchpoint_condition, t); INHERIT (to_can_accel_watchpoint_condition, t);
/* Do not inherit to_masked_watch_num_registers. */ /* Do not inherit to_masked_watch_num_registers. */
@ -734,8 +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_watchpoint_addr_within_range,
default_watchpoint_addr_within_range);
de_fault (to_region_ok_for_hw_watchpoint, de_fault (to_region_ok_for_hw_watchpoint,
default_region_ok_for_hw_watchpoint); default_region_ok_for_hw_watchpoint);
de_fault (to_can_accel_watchpoint_condition, de_fault (to_can_accel_watchpoint_condition,

3
gdb/target.h
View File

@ -485,7 +485,8 @@ struct target_ops
int (*to_stopped_data_address) (struct target_ops *, CORE_ADDR *) int (*to_stopped_data_address) (struct target_ops *, CORE_ADDR *)
TARGET_DEFAULT_RETURN (0); TARGET_DEFAULT_RETURN (0);
int (*to_watchpoint_addr_within_range) (struct target_ops *, int (*to_watchpoint_addr_within_range) (struct target_ops *,
CORE_ADDR, CORE_ADDR, int); CORE_ADDR, CORE_ADDR, int)
TARGET_DEFAULT_FUNC (default_watchpoint_addr_within_range);
/* Documentation of this routine is provided with the corresponding /* Documentation of this routine is provided with the corresponding
target_* macro. */ target_* macro. */