FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert to_can_accel_watchpoint_condition

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_can_accel_watchpoint_condition.
	* target.h (struct target_ops)
	<to_can_accel_watchpoint_condition>: Use TARGET_DEFAULT_RETURN.
This commit is contained in:
Tom Tromey 2013-12-18 10:20:48 -07:00
parent d03655e4a5
commit 77cdffe90e
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_can_accel_watchpoint_condition.
* target.h (struct target_ops)
<to_can_accel_watchpoint_condition>: 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

@ -217,6 +217,19 @@ delegate_region_ok_for_hw_watchpoint (struct target_ops *self, CORE_ADDR arg1, i
return self->to_region_ok_for_hw_watchpoint (self, arg1, arg2); return self->to_region_ok_for_hw_watchpoint (self, arg1, arg2);
} }
static int
delegate_can_accel_watchpoint_condition (struct target_ops *self, CORE_ADDR arg1, int arg2, int arg3, struct expression *arg4)
{
self = self->beneath;
return self->to_can_accel_watchpoint_condition (self, arg1, arg2, arg3, arg4);
}
static int
tdefault_can_accel_watchpoint_condition (struct target_ops *self, CORE_ADDR arg1, int arg2, int arg3, struct expression *arg4)
{
return 0;
}
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)
{ {
@ -318,6 +331,8 @@ install_delegators (struct target_ops *ops)
ops->to_watchpoint_addr_within_range = delegate_watchpoint_addr_within_range; ops->to_watchpoint_addr_within_range = delegate_watchpoint_addr_within_range;
if (ops->to_region_ok_for_hw_watchpoint == NULL) if (ops->to_region_ok_for_hw_watchpoint == NULL)
ops->to_region_ok_for_hw_watchpoint = delegate_region_ok_for_hw_watchpoint; ops->to_region_ok_for_hw_watchpoint = delegate_region_ok_for_hw_watchpoint;
if (ops->to_can_accel_watchpoint_condition == NULL)
ops->to_can_accel_watchpoint_condition = delegate_can_accel_watchpoint_condition;
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)
@ -354,6 +369,7 @@ install_dummy_methods (struct target_ops *ops)
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_watchpoint_addr_within_range = default_watchpoint_addr_within_range;
ops->to_region_ok_for_hw_watchpoint = default_region_ok_for_hw_watchpoint; ops->to_region_ok_for_hw_watchpoint = default_region_ok_for_hw_watchpoint;
ops->to_can_accel_watchpoint_condition = tdefault_can_accel_watchpoint_condition;
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;

6
gdb/target.c
View file

@ -618,7 +618,7 @@ update_current_target (void)
/* Do not inherit to_stopped_by_watchpoint. */ /* Do not inherit to_stopped_by_watchpoint. */
/* Do not inherit to_watchpoint_addr_within_range. */ /* Do not inherit to_watchpoint_addr_within_range. */
/* Do not inherit to_region_ok_for_hw_watchpoint. */ /* Do not inherit to_region_ok_for_hw_watchpoint. */
INHERIT (to_can_accel_watchpoint_condition, t); /* Do not inherit to_can_accel_watchpoint_condition. */
/* Do not inherit to_masked_watch_num_registers. */ /* Do not inherit to_masked_watch_num_registers. */
INHERIT (to_terminal_init, t); INHERIT (to_terminal_init, t);
INHERIT (to_terminal_inferior, t); INHERIT (to_terminal_inferior, 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_can_accel_watchpoint_condition,
(int (*) (struct target_ops *, CORE_ADDR, int, int,
struct expression *))
return_zero);
de_fault (to_terminal_init, de_fault (to_terminal_init,
(void (*) (struct target_ops *)) (void (*) (struct target_ops *))
target_ignore); target_ignore);

3
gdb/target.h
View file

@ -496,7 +496,8 @@ struct target_ops
int (*to_can_accel_watchpoint_condition) (struct target_ops *, int (*to_can_accel_watchpoint_condition) (struct target_ops *,
CORE_ADDR, int, int, CORE_ADDR, int, int,
struct expression *); struct expression *)
TARGET_DEFAULT_RETURN (0);
int (*to_masked_watch_num_registers) (struct target_ops *, int (*to_masked_watch_num_registers) (struct target_ops *,
CORE_ADDR, CORE_ADDR); CORE_ADDR, CORE_ADDR);
void (*to_terminal_init) (struct target_ops *); void (*to_terminal_init) (struct target_ops *);