* remote-sim.c (simulator_command): Set up callbacks before

	entering the simulator.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9a5a10edea2b78241b29cc745ff0de0d44f3ddc4..be756a313943142554bf434d64cde8d038806537 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov  8 12:29:51 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+       * remote-sim.c (simulator_command): Set up callbacks before
+       entering the simulator.
+
 start-sanitize-d10v
 Thu Nov  7 15:19:08 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 5c9e7129f66b7986475e61834412ffee64f6b9cf..010d501138cd994d01766bdf37f740cdf1955530 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -441,15 +441,19 @@ gdbsim_mourn_inferior ()
   generic_mourn_inferior ();
 }
 
-/* Put a command string, in args, out to MONITOR.  Output from MONITOR
-   is placed on the users terminal until the prompt is seen. FIXME: We
-   read the characters ourseleves here cause of a nasty echo.  */
+/* Pass the command argument through to the simulator verbatim.  The
+   simulator must do any command interpretation work.  */
 
 static void
 simulator_command (args, from_tty)
      char *args;
      int from_tty;
 {
+  /* The user may give a command before the simulator is opened, so
+     ensure that the callbacks have been set up.  */
+  sim_set_callbacks (&default_callback);
+  default_callback.init (&default_callback);
+
   sim_do_command (args);
 }