Index: common/ChangeLog

[deliverable/binutils-gdb.git] / sim / common / run.c

diff --git a/sim/common/run.c b/sim/common/run.c
index 66f76f5114d226d5f66dd1faa39996dd01b1ab45..ca3194b5277a6c17572811e373b30d05811a199d 100644 (file)
--- a/sim/common/run.c
+++ b/sim/common/run.c
@@ -1,5 +1,5 @@
 /* run front end support for all the simulators.
-   Copyright (C) 1992, 93-96, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1992, 93-96, 1997, 2002 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -43,9 +43,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "libiberty.h"
 #include "bfd.h"
-#include "callback.h"
-#include "remote-sim.h"
+#include "gdb/callback.h"
+#include "gdb/remote-sim.h"
 #include "ansidecl.h"
+#include "run-sim.h"
 
 static void usage PARAMS ((void));
 extern int optind;
@@ -58,7 +59,7 @@ static char *myname;
 extern int getopt ();
 
 #ifdef NEED_UI_LOOP_HOOK
-/* Gdb foolery. This is only needed for gdb using a gui. */
+/* Gdb foolery. This is only needed for gdb using a gui.  */
 int (*ui_loop_hook) PARAMS ((int signo));
 #endif
 
@@ -107,17 +108,21 @@ main (ac, av)
 
   /* FIXME: This is currently being migrated into sim_open.
      Simulators that use functions such as sim_size() still require
-     this. */
+     this.  */
   default_callback.init (&default_callback);
   sim_set_callbacks (&default_callback);
 
+#ifdef SIM_TARGET_SWITCHES
+  ac = sim_target_parse_command_line (ac, av);
+#endif
+
   /* FIXME: This is currently being rewritten to have each simulator
      do all argv processing.  */
 
 #ifdef SIM_H8300 /* FIXME: quick hack */
-  while ((i = getopt (ac, av, "a:c:m:op:s:htv")) != EOF) 
+  while ((i = getopt (ac, av, "a:c:m:op:s:hStv")) != EOF)
 #else
-  while ((i = getopt (ac, av, "a:c:m:op:s:tv")) != EOF) 
+  while ((i = getopt (ac, av, "a:c:m:op:s:tv")) != EOF)
 #endif
     switch (i)
       {
@@ -148,10 +153,10 @@ main (ac, av)
 #ifdef SIM_HAVE_ENVIRONMENT
       case 'o':
        /* Operating enironment where any signals are delivered to the
-           target. */
+           target.  */
        operating_p = 1;
        break;
-#endif SIM_HAVE_ENVIRONMENT
+#endif
 #ifdef SIM_HAVE_PROFILE
       case 'p':
        sim_set_profile (atoi (optarg));
@@ -173,7 +178,10 @@ main (ac, av)
        /* FIXME: Quick hack, to be replaced by more general facility.  */
 #ifdef SIM_H8300
       case 'h':
-       set_h8300h (1);
+       set_h8300h (1, 0);
+       break;
+      case 'S':
+       set_h8300h (1, 1);
        break;
 #endif
       default:
@@ -194,9 +202,9 @@ main (ac, av)
     }
 
   abfd = bfd_openr (name, 0);
-  if (!abfd) 
+  if (!abfd)
     {
-      fprintf (stderr, "%s: can't open %s: %s\n", 
+      fprintf (stderr, "%s: can't open %s: %s\n",
               myname, name, bfd_errmsg (bfd_get_error ()));
       exit (1);
     }
@@ -223,7 +231,7 @@ main (ac, av)
 #endif
 
   /* Ensure that any run-time initialisation that needs to be
-     performed by the simulator can occur. */
+     performed by the simulator can occur.  */
   sd = sim_open (SIM_OPEN_STANDALONE, &default_callback, abfd, sim_argv);
   if (sd == 0)
     exit (1);
@@ -237,7 +245,7 @@ main (ac, av)
 #ifdef SIM_HAVE_ENVIRONMENT
   /* NOTE: An old simulator supporting the operating environment MUST
      provide sim_set_trace() and not sim_trace(). That way
-     sim_stop_reason() can be used to determine any stop reason. */
+     sim_stop_reason() can be used to determine any stop reason.  */
   if (trace)
     sim_set_trace ();
   sigrc = 0;
@@ -291,14 +299,14 @@ main (ac, av)
     case sim_signalled:
     case sim_stopped:
       if (sigrc != 0)
-        fprintf (stderr, "program stopped with signal %d.\n", sigrc);
+       fprintf (stderr, "program stopped with signal %d.\n", sigrc);
       break;
 
     case sim_exited:
       break;
 
     case sim_running:
-    case sim_polling: /* these indicate a serious problem */
+    case sim_polling: /* These indicate a serious problem.  */
       abort ();
       break;
 
@@ -318,7 +326,8 @@ usage ()
   fprintf (stderr, "-c size         Set simulator cache size to `size'.\n");
 #endif
 #ifdef SIM_H8300
-  fprintf (stderr, "-h              Executable is for h8/300h or h8/300s.\n");
+  fprintf (stderr, "-h              Executable is for h8/300h.\n");
+  fprintf (stderr, "-S              Executable is for h8/300s.\n");
 #endif
   fprintf (stderr, "-m size         Set memory size of simulator, in bytes.\n");
 #ifdef SIM_HAVE_ENVIRONMENT
@@ -334,5 +343,9 @@ usage ()
   fprintf (stderr, "\n");
   fprintf (stderr, "program args    Arguments to pass to simulated program.\n");
   fprintf (stderr, "                Note: Very few simulators support this.\n");
+#ifdef SIM_TARGET_SWITCHES
+  fprintf (stderr, "\nTarget specific options:\n");
+  sim_target_display_usage ();
+#endif
   exit (1);
 }