Modify last patch based on advice from Stu.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f3fb98..d446914 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct  6 11:56:49 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
+
+       * remote-sim.c (gdbsim_open): Put callback initializations here.
+       (_initalize_remote_sim): Not here.
+
 Fri Oct  6 17:08:49 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
        * top.c (execute_control_command): Use 0/1 instead of BFD's

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 27b17ad..c7208b0 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -218,6 +218,10 @@ gdbsim_open (args, from_tty)
   if (sr_get_debug ())
     printf_filtered ("gdbsim_open: args \"%s\"\n", args ? args : "(null)");
   sim_open (args);
+
+  sim_set_callbacks (&default_callback);
+  default_callback.init (&default_callback);
+
   push_target (&gdbsim_ops);
   target_fetch_registers (-1);
   printf_filtered ("Connected to the simulator.\n");
@@ -460,7 +464,4 @@ _initialize_remote_sim ()
 
   add_com ("sim <command>", class_obscure, simulator_command,
           "Send a command to the simulator."); 
-
-  sim_set_callbacks (&default_callback);
-  default_callback.init (&default_callback);
 }