convert to_load

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_load.
	* target.h (struct target_ops) <to_load>: Use
	TARGET_DEFAULT_NORETURN.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2405d2840e6f3a53f44698170d3efa4c31f2ecc8..3a0a45a30f95af985e4f6695b6bac835a98902c4 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_load.
+       * target.h (struct target_ops) <to_load>: Use
+       TARGET_DEFAULT_NORETURN.
+
 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 92729d62406895b20d2c2f1dc80c398165aa63ec..80e7ede9c1b311ce54ba550386349012b3354f21 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -297,6 +297,19 @@ delegate_terminal_info (struct target_ops *self, const char *arg1, int arg2)
   self->to_terminal_info (self, arg1, arg2);
 }
 
+static void
+delegate_load (struct target_ops *self, char *arg1, int arg2)
+{
+  self = self->beneath;
+  self->to_load (self, arg1, arg2);
+}
+
+static void
+tdefault_load (struct target_ops *self, char *arg1, int arg2)
+{
+  tcomplain ();
+}
+
 static void
 delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
 {
@@ -412,6 +425,8 @@ install_delegators (struct target_ops *ops)
     ops->to_terminal_save_ours = delegate_terminal_save_ours;
   if (ops->to_terminal_info == NULL)
     ops->to_terminal_info = delegate_terminal_info;
+  if (ops->to_load == NULL)
+    ops->to_load = delegate_load;
   if (ops->to_rcmd == NULL)
     ops->to_rcmd = delegate_rcmd;
   if (ops->to_can_async_p == NULL)
@@ -455,6 +470,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_terminal_ours = tdefault_terminal_ours;
   ops->to_terminal_save_ours = tdefault_terminal_save_ours;
   ops->to_terminal_info = default_terminal_info;
+  ops->to_load = tdefault_load;
   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 4de28101e21e8c4af81b2c4338972036511e9630..08b217c60e49f47f5c3d95ea4bed521b2117a202 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -627,7 +627,7 @@ update_current_target (void)
       /* Do not inherit to_terminal_save_ours.  */
       /* Do not inherit to_terminal_info.  */
       /* Do not inherit to_kill.  */
-      INHERIT (to_load, t);
+      /* Do not inherit to_load.  */
       /* Do no inherit to_create_inferior.  */
       INHERIT (to_post_startup_inferior, t);
       INHERIT (to_insert_fork_catchpoint, 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_load,
-           (void (*) (struct target_ops *, char *, int))
-           tcomplain);
   de_fault (to_post_startup_inferior,
            (void (*) (struct target_ops *, ptid_t))
            target_ignore);

diff --git a/gdb/target.h b/gdb/target.h
index cee51500f34a090ccc2706ccf6cb5b988f09c068..b37d07038a0e8c1066554b086d9dc1622200c8f3 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -513,7 +513,8 @@ struct target_ops
     void (*to_terminal_info) (struct target_ops *, const char *, int)
       TARGET_DEFAULT_FUNC (default_terminal_info);
     void (*to_kill) (struct target_ops *);
-    void (*to_load) (struct target_ops *, char *, int);
+    void (*to_load) (struct target_ops *, char *, int)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
     void (*to_create_inferior) (struct target_ops *, 
                                char *, char *, char **, int);
     void (*to_post_startup_inferior) (struct target_ops *, ptid_t);