X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fnrun.c;h=8e9287982781a69c7db82e881edace9f0a56737b;hb=2232061b1ccf68bb1e46c95cab6f531831d72aa5;hp=c5b43a25eed9c91b5c5c5c7fea16fd4c2dbead7f;hpb=abd8680d6efd97e7ba848a6392ee3ad72be18cd0;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/nrun.c b/sim/common/nrun.c
index c5b43a25ee..8e92879827 100644
--- a/sim/common/nrun.c
+++ b/sim/common/nrun.c
@@ -1,21 +1,30 @@
 /* New version of run front end support for simulators.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004, 2007-2012 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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
+
+/* For strsignal.  */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+
 #include "sim-main.h"
 
 #include "bfd.h"
@@ -24,6 +33,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 extern char **environ;
 #endif
 
+#ifdef HAVE_UNISTD_H
+/* For chdir.  */
+#include <unistd.h>
+#endif
+
 static void usage (void);
 
 extern host_callback default_callback;
@@ -47,7 +61,7 @@ main (int argc, char **argv)
 {
   char *name;
   char **prog_argv = NULL;
-  struct _bfd *prog_bfd;
+  struct bfd *prog_bfd;
   enum sim_stop reason;
   int sigrc = 0;
   int single_step = 0;
@@ -77,6 +91,12 @@ main (int argc, char **argv)
       abort ();
     }
 
+  /* We can't set the endianness in the callback structure until
+     sim_config is called, which happens in sim_open.  */
+  default_callback.target_endian
+    = (CURRENT_TARGET_BYTE_ORDER == BIG_ENDIAN
+       ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE);
+
   /* Was there a program to run?  */
   prog_argv = STATE_PROG_ARGV (sd);
   prog_bfd = STATE_PROG_BFD (sd);
@@ -91,11 +111,11 @@ main (int argc, char **argv)
       prog_bfd = bfd_openr (name, 0);
       if (prog_bfd == NULL)
 	{
-	  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);
 	}
-      if (!bfd_check_format (prog_bfd, bfd_object)) 
+      if (!bfd_check_format (prog_bfd, bfd_object))
 	{
 	  fprintf (stderr, "%s: \"%s\" is not an object file: %s\n",
 		   myname, name, bfd_errmsg (bfd_get_error ()));
@@ -117,6 +137,16 @@ main (int argc, char **argv)
   sim_create_inferior (sd, prog_bfd, prog_argv, NULL);
 #endif
 
+  /* To accommodate relative file paths, chdir to sysroot now.  We
+     mustn't do this until BFD has opened the program, else we wouldn't
+     find the executable if it has a relative file path.  */
+  if (simulator_sysroot[0] != '\0' && chdir (simulator_sysroot) < 0)
+    {
+      fprintf (stderr, "%s: can't change directory to \"%s\"\n",
+	       myname, simulator_sysroot);
+      exit (1);
+    }
+
   /* Run/Step the program.  */
   if (single_step)
     {
@@ -134,10 +164,10 @@ main (int argc, char **argv)
       /* remain on breakpoint or signals in oe mode*/
       while (((reason == sim_signalled) &&
 	      (sigrc == sim_signal_to_host (sd, SIM_SIGTRAP))) ||
-	     ((reason == sim_stopped) && 
+	     ((reason == sim_stopped) &&
 	      (STATE_ENVIRONMENT (sd) == OPERATING_ENVIRONMENT)));
     }
-  else 
+  else
     {
       do
 	{
@@ -154,39 +184,36 @@ main (int argc, char **argv)
 	  sim_resume (sd, 0, sigrc);
 	  signal (SIGINT, prev_sigint);
 	  sim_stop_reason (sd, &reason, &sigrc);
-	  
+
 	  if ((reason == sim_stopped) &&
 	      (sigrc == sim_signal_to_host (sd, SIM_SIGINT)))
 	    break; /* exit on control-C */
-	  
+
 	  /* remain on signals in oe mode */
 	} while ((reason == sim_stopped) &&
 		 (STATE_ENVIRONMENT (sd) == OPERATING_ENVIRONMENT));
-      
+
     }
   /* Print any stats the simulator collected.  */
-  sim_info (sd, 0);
-  
+  if (STATE_VERBOSE_P (sd))
+    sim_info (sd, 0);
+
   /* Shutdown the simulator.  */
   sim_close (sd, 0);
-  
+
   /* If reason is sim_exited, then sigrc holds the exit code which we want
      to return.  If reason is sim_stopped or sim_signalled, then sigrc holds
      the signal that the simulator received; we want to return that to
      indicate failure.  */
-  
-#ifdef SIM_H8300 /* FIXME: Ugh.  grep for SLEEP in compile.c  */
-  if (sigrc == SIGILL)
-    abort ();
-  sigrc = 0;
-#else
+
   /* Why did we stop? */
   switch (reason)
     {
     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 (%s).\n", sigrc,
+		 strsignal (sigrc));
       break;
 
     case sim_exited:
@@ -197,13 +224,12 @@ main (int argc, char **argv)
       break;
 
     }
-#endif
 
   return sigrc;
 }
 
 static void
-usage ()
+usage (void)
 {
   fprintf (stderr, "Usage: %s [options] program [program args]\n", myname);
   fprintf (stderr, "Run `%s --help' for full list of options.\n", myname);