* stabsread.c (get_substring): Declare second arg as int.

[deliverable/binutils-gdb.git] / gdb / remote-sim.c

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 2a3e527d9c08420a358c6ba3d8e6db0b4c187d23..124022accb85ab20eecb54a9b836dd2f9fa72042 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -17,13 +17,13 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "inferior.h"
 #include "wait.h"
 #include "value.h"
-#include <string.h>
+#include "gdb_string.h"
 #include <ctype.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -34,11 +34,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "gdbcore.h"
 #include "remote-sim.h"
 #include "remote-utils.h"
+#include "callback.h"
 
 /* Naming convention:
 
    sim_* are the interface to the simulator (see remote-sim.h).
-
+   sim_callback_* are the stuff which the simulator can see inside GDB.
    gdbsim_* are stuff which is internal to gdb.  */
 
 /* Forward data declarations */
@@ -95,6 +96,7 @@ int regno;
     }
 }
 
+
 static void
 gdbsim_store_register (regno)
 int regno;
@@ -150,7 +152,7 @@ gdbsim_load (prog, fromtty)
   program_loaded = 1;
 
   if (sim_load (prog, fromtty) != 0)
-    gr_load_image (prog, fromtty);
+    generic_load (prog, fromtty);
 }
 
 
@@ -216,11 +218,13 @@ gdbsim_open (args, from_tty)
   if (sr_get_debug ())
     printf_filtered ("gdbsim_open: args \"%s\"\n", args ? args : "(null)");
 
+  sim_set_callbacks (&default_callback);
+  default_callback.init (&default_callback);
+
   sim_open (args);
 
   push_target (&gdbsim_ops);
   target_fetch_registers (-1);
-
   printf_filtered ("Connected to the simulator.\n");
 }
 
@@ -276,6 +280,9 @@ gdbsim_resume (pid, step, siggnal)
      int pid, step;
      enum target_signal siggnal;
 {
+  if (inferior_pid != 42)
+    error ("The program is not being run.");
+
   if (sr_get_debug ())
     printf_filtered ("gdbsim_resume: step %d, signal %d\n", step, siggnal);
 
@@ -385,7 +392,7 @@ gdbsim_files_info (target)
     }
 }
 
-/* Clear the sims notion of what the break points are.  */
+/* Clear the simulator's notion of what the break points are.  */
 
 static void
 gdbsim_mourn_inferior () 
@@ -397,35 +404,68 @@ gdbsim_mourn_inferior ()
   generic_mourn_inferior ();
 }
 
-/* Define the target subroutine names */
+/* 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.  */
 
-struct target_ops gdbsim_ops = 
+static void
+simulator_command (args, from_tty)
+     char *args;
+     int from_tty;
 {
-  "sim", "simulator",
-  "Use the simulator",
-  gdbsim_open, gdbsim_close, 
-  0, gdbsim_detach, gdbsim_resume, gdbsim_wait, /* attach */
-  gdbsim_fetch_register, gdbsim_store_register,
-  gdbsim_prepare_to_store,
-  gdbsim_xfer_inferior_memory, 
-  gdbsim_files_info,
-  0, 0,                                /* Breakpoints */
-  0, 0, 0, 0, 0,               /* Terminal handling */
-  gdbsim_kill,                 /* kill */
-  gdbsim_load,                 /* load */
-  0,                           /* lookup_symbol */
-  gdbsim_create_inferior,      /* create_inferior */ 
-  gdbsim_mourn_inferior,       /* mourn_inferior */
-  0,                           /* can_run */
-  0,                           /* notice_signals */
-  process_stratum, 0,          /* next */
-  1, 1, 1, 1, 1,               /* all mem, mem, stack, regs, exec */
-  0, 0,                                /* Section pointers */
-  OPS_MAGIC,                   /* Always the last thing */
+  sim_do_command (args);
+}
+
+/* Define the target subroutine names */
+
+struct target_ops gdbsim_ops = {
+  "sim",                       /* to_shortname */
+  "simulator",                 /* to_longname */
+  "Use the compiled-in simulator.",  /* to_doc */
+  gdbsim_open,                 /* to_open */
+  gdbsim_close,                        /* to_close */
+  NULL,                                /* to_attach */
+  gdbsim_detach,               /* to_detach */
+  gdbsim_resume,               /* to_resume */
+  gdbsim_wait,                 /* to_wait */
+  gdbsim_fetch_register,       /* to_fetch_registers */
+  gdbsim_store_register,       /* to_store_registers */
+  gdbsim_prepare_to_store,     /* to_prepare_to_store */
+  gdbsim_xfer_inferior_memory, /* to_xfer_memory */
+  gdbsim_files_info,           /* to_files_info */
+  memory_insert_breakpoint,    /* to_insert_breakpoint */
+  memory_remove_breakpoint,    /* to_remove_breakpoint */
+  NULL,                                /* to_terminal_init */
+  NULL,                                /* to_terminal_inferior */
+  NULL,                                /* to_terminal_ours_for_output */
+  NULL,                                /* to_terminal_ours */
+  NULL,                                /* to_terminal_info */
+  gdbsim_kill,                 /* to_kill */
+  gdbsim_load,                 /* to_load */
+  NULL,                                /* to_lookup_symbol */
+  gdbsim_create_inferior,      /* to_create_inferior */ 
+  gdbsim_mourn_inferior,       /* to_mourn_inferior */
+  0,                           /* to_can_run */
+  0,                           /* to_notice_signals */
+  0,                           /* to_thread_alive */
+  0,                           /* to_stop */
+  process_stratum,             /* to_stratum */
+  NULL,                                /* to_next */
+  1,                           /* to_has_all_memory */
+  1,                           /* to_has_memory */
+  1,                           /* to_has_stack */
+  1,                           /* to_has_registers */
+  1,                           /* to_has_execution */
+  NULL,                                /* sections */
+  NULL,                                /* sections_end */
+  OPS_MAGIC,                   /* to_magic */
 };
 
 void
 _initialize_remote_sim ()
 {
   add_target (&gdbsim_ops);
+
+  add_com ("sim <command>", class_obscure, simulator_command,
+          "Send a command to the simulator."); 
 }