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

convert to_terminal_init

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_terminal_init.
	* target.h (struct target_ops) <to_terminal_init>: Use
	TARGET_DEFAULT_IGNORE.
This commit is contained in:
Tom Tromey 2013-12-18 10:24:07 -07:00
parent 77cdffe90e
commit 0343661d23
4 changed files with 26 additions and 5 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_terminal_init.
* target.h (struct target_ops) <to_terminal_init>: Use
TARGET_DEFAULT_IGNORE.
2014-02-19 Tom Tromey <tromey@redhat.com> 2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild. * target-delegates.c: Rebuild.

15
gdb/target-delegates.c
View file

@ -230,6 +230,18 @@ tdefault_can_accel_watchpoint_condition (struct target_ops *self, CORE_ADDR arg1
return 0; return 0;
} }
static void
delegate_terminal_init (struct target_ops *self)
{
self = self->beneath;
self->to_terminal_init (self);
}
static void
tdefault_terminal_init (struct target_ops *self)
{
}
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)
{ {
@ -333,6 +345,8 @@ install_delegators (struct target_ops *ops)
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) if (ops->to_can_accel_watchpoint_condition == NULL)
ops->to_can_accel_watchpoint_condition = delegate_can_accel_watchpoint_condition; ops->to_can_accel_watchpoint_condition = delegate_can_accel_watchpoint_condition;
if (ops->to_terminal_init == NULL)
ops->to_terminal_init = delegate_terminal_init;
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)
@ -370,6 +384,7 @@ install_dummy_methods (struct target_ops *ops)
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_can_accel_watchpoint_condition = tdefault_can_accel_watchpoint_condition;
ops->to_terminal_init = tdefault_terminal_init;
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;

5
gdb/target.c
View file

@ -620,7 +620,7 @@ update_current_target (void)
/* Do not inherit to_region_ok_for_hw_watchpoint. */ /* Do not inherit to_region_ok_for_hw_watchpoint. */
/* Do not inherit to_can_accel_watchpoint_condition. */ /* 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); /* Do not inherit to_terminal_init. */
INHERIT (to_terminal_inferior, t); INHERIT (to_terminal_inferior, t);
INHERIT (to_terminal_ours_for_output, t); INHERIT (to_terminal_ours_for_output, t);
INHERIT (to_terminal_ours, t); INHERIT (to_terminal_ours, t);
@ -734,9 +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_terminal_init,
(void (*) (struct target_ops *))
target_ignore);
de_fault (to_terminal_inferior, de_fault (to_terminal_inferior,
(void (*) (struct target_ops *)) (void (*) (struct target_ops *))
target_ignore); target_ignore);

3
gdb/target.h
View file

@ -500,7 +500,8 @@ struct target_ops
TARGET_DEFAULT_RETURN (0); 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 *)
TARGET_DEFAULT_IGNORE ();
void (*to_terminal_inferior) (struct target_ops *); void (*to_terminal_inferior) (struct target_ops *);
void (*to_terminal_ours_for_output) (struct target_ops *); void (*to_terminal_ours_for_output) (struct target_ops *);
void (*to_terminal_ours) (struct target_ops *); void (*to_terminal_ours) (struct target_ops *);