From ddeaacc9e11d0de47a799af1ef8e96a7cff255f7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 10:29:01 -0700 Subject: [PATCH] convert to_terminal_inferior 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_terminal_inferior. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 15 +++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5f0244a522..e455c93418 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_terminal_inferior. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_IGNORE. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index f1d051c127..81ea7e87a9 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -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 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; if (ops->to_terminal_init == NULL) 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) ops->to_rcmd = delegate_rcmd; 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_can_accel_watchpoint_condition = tdefault_can_accel_watchpoint_condition; ops->to_terminal_init = tdefault_terminal_init; + ops->to_terminal_inferior = tdefault_terminal_inferior; ops->to_rcmd = default_rcmd; ops->to_can_async_p = find_default_can_async_p; ops->to_is_async_p = find_default_is_async_p; diff --git a/gdb/target.c b/gdb/target.c index acf74fd1bc..7ff4f989e0 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -621,7 +621,7 @@ update_current_target (void) /* Do not inherit to_can_accel_watchpoint_condition. */ /* Do not inherit to_masked_watch_num_registers. */ /* 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, t); INHERIT (to_terminal_save_ours, t); @@ -734,9 +734,6 @@ update_current_target (void) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_terminal_inferior, - (void (*) (struct target_ops *)) - target_ignore); de_fault (to_terminal_ours_for_output, (void (*) (struct target_ops *)) target_ignore); diff --git a/gdb/target.h b/gdb/target.h index 7eba273e54..f3c3dd90b1 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -502,7 +502,8 @@ struct target_ops CORE_ADDR, CORE_ADDR); void (*to_terminal_init) (struct target_ops *) 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) (struct target_ops *); void (*to_terminal_save_ours) (struct target_ops *); -- 2.34.1