convert to_terminal_init

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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 43cb9a17d4800a45b78e7c45b8184d0c4e6f2b9a..5f0244a522f611853042691affacc8be55a89caf 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 
        * target-delegates.c: Rebuild.

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 498f2b9b33fda2972671424e143efaea23a9de23..f1d051c127b79c207ed533fd2a687bc3c767e376 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -230,6 +230,18 @@ tdefault_can_accel_watchpoint_condition (struct target_ops *self, CORE_ADDR arg1
   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
 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;
   if (ops->to_can_accel_watchpoint_condition == NULL)
     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)
     ops->to_rcmd = delegate_rcmd;
   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_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_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 a6f7b7c9ad7318d1dbc5f92adec23c6922e34902..acf74fd1bc03b3cd33529bd85e8f470244e6b2c7 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -620,7 +620,7 @@ update_current_target (void)
       /* Do not inherit to_region_ok_for_hw_watchpoint.  */
       /* Do not inherit to_can_accel_watchpoint_condition.  */
       /* 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_ours_for_output, t);
       INHERIT (to_terminal_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_init,
-           (void (*) (struct target_ops *))
-           target_ignore);
   de_fault (to_terminal_inferior,
            (void (*) (struct target_ops *))
            target_ignore);

diff --git a/gdb/target.h b/gdb/target.h
index 5cdafbf467b4ea8cf62ae11f60793a58e511b4cd..7eba273e543dd4bae041bd7b0dc75f09057c9e47 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -500,7 +500,8 @@ struct target_ops
       TARGET_DEFAULT_RETURN (0);
     int (*to_masked_watch_num_registers) (struct target_ops *,
                                          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_ours_for_output) (struct target_ops *);
     void (*to_terminal_ours) (struct target_ops *);