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

convert to_terminal_inferior

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_inferior.
	* target.h (struct target_ops) <to_terminal_inferior>: Use
	TARGET_DEFAULT_IGNORE.
This commit is contained in:
Tom Tromey 2013-12-18 10:29:01 -07:00
parent 0343661d23
commit ddeaacc9e1
4 changed files with 26 additions and 5 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_terminal_inferior.
* target.h (struct target_ops) <to_terminal_inferior>: 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

@ -242,6 +242,18 @@ tdefault_terminal_init (struct target_ops *self)
{ {
} }
static void
delegate_terminal_inferior (struct target_ops *self)
{
self = self->beneath;
self->to_terminal_inferior (self);
}
static void
tdefault_terminal_inferior (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)
{ {
@ -347,6 +359,8 @@ install_delegators (struct target_ops *ops)
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) if (ops->to_terminal_init == NULL)
ops->to_terminal_init = delegate_terminal_init; ops->to_terminal_init = delegate_terminal_init;
if (ops->to_terminal_inferior == NULL)
ops->to_terminal_inferior = delegate_terminal_inferior;
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)
@ -385,6 +399,7 @@ install_dummy_methods (struct target_ops *ops)
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_terminal_init = tdefault_terminal_init;
ops->to_terminal_inferior = tdefault_terminal_inferior;
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

@ -621,7 +621,7 @@ update_current_target (void)
/* 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. */
/* Do not inherit to_terminal_init. */ /* Do not inherit to_terminal_init. */
INHERIT (to_terminal_inferior, t); /* Do not inherit to_terminal_inferior. */
INHERIT (to_terminal_ours_for_output, t); INHERIT (to_terminal_ours_for_output, t);
INHERIT (to_terminal_ours, t); INHERIT (to_terminal_ours, t);
INHERIT (to_terminal_save_ours, t); INHERIT (to_terminal_save_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_inferior,
(void (*) (struct target_ops *))
target_ignore);
de_fault (to_terminal_ours_for_output, de_fault (to_terminal_ours_for_output,
(void (*) (struct target_ops *)) (void (*) (struct target_ops *))
target_ignore); target_ignore);

3
gdb/target.h
View File

@ -502,7 +502,8 @@ 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 (); TARGET_DEFAULT_IGNORE ();
void (*to_terminal_inferior) (struct target_ops *); void (*to_terminal_inferior) (struct target_ops *)
TARGET_DEFAULT_IGNORE ();
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 *);
void (*to_terminal_save_ours) (struct target_ops *); void (*to_terminal_save_ours) (struct target_ops *);