* config/sh/tm-sh.h (BELIEVE_PCC_PROMOTION): Define, so that

[thirdparty/binutils-gdb.git] / sim / common / sim-utils.c

diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c
index b62317ce2af274cd2127d1db44319161ed3780d0..8327c5eb899a03ca07a4d2dd0df3efc2364b7e95 100644 (file)
--- a/sim/common/sim-utils.c
+++ b/sim/common/sim-utils.c
@@ -1,5 +1,5 @@
 /* Miscellaneous simulator utilities.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
@@ -53,7 +53,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
    Set by sim_resume.  */
 struct sim_state *current_state;
 
-/* Allocate zero filled memory with xmalloc.  */
+/* Allocate zero filled memory with xmalloc - xmalloc aborts of the
+   allocation fails.  */
 
 void *
 zalloc (unsigned long size)
@@ -72,10 +73,35 @@ zfree (void *data)
 /* Allocate a sim_state struct.  */
 
 SIM_DESC
-sim_state_alloc (void)
+sim_state_alloc (SIM_OPEN_KIND kind,
+                host_callback *callback)
 {
-  SIM_DESC sd = zalloc (sizeof (struct sim_state));
-  sd->base.magic = SIM_MAGIC_NUMBER;
+  SIM_DESC sd = ZALLOC (struct sim_state);
+
+  STATE_MAGIC (sd) = SIM_MAGIC_NUMBER;
+  STATE_CALLBACK (sd) = callback;
+  STATE_OPEN_KIND (sd) = kind;
+
+#if 0
+  {
+    int cpu_nr;
+
+    /* Initialize the back link from the cpu struct to the state struct.  */
+    /* ??? I can envision a design where the state struct contains an array
+       of pointers to cpu structs, rather than an array of structs themselves.
+       Implementing this is trickier as one may not know what to allocate until
+       one has parsed the args.  Parsing the args twice wouldn't be unreasonable,
+       IMHO.  If the state struct ever does contain an array of pointers then we
+       can't do this here.  */
+    for (cpu_nr = 0; cpu_nr < MAX_NR_PROCESSORS; cpu_nr++)
+      CPU_STATE (STATE_CPU (sd, cpu_nr)) = sd;
+  }
+#endif
+
+#ifdef SIM_STATE_INIT
+  SIM_STATE_INIT (sd);
+#endif
+
   return sd;
 }
 
@@ -85,9 +111,27 @@ void
 sim_state_free (SIM_DESC sd)
 {
   ASSERT (sd->base.magic == SIM_MAGIC_NUMBER);
+
+#ifdef SIM_STATE_FREE
+  SIM_STATE_FREE (sd);
+#endif
+
   zfree (sd);
 }
 
+/* Return a pointer to the cpu data for CPU_NAME, or NULL if not found.  */
+
+sim_cpu *
+sim_cpu_lookup (SIM_DESC sd, const char *cpu_name)
+{
+  int i;
+
+  for (i = 0; i < MAX_NR_PROCESSORS; ++i)
+    if (strcmp (cpu_name, CPU_NAME (STATE_CPU (sd, i))) == 0)
+      return STATE_CPU (sd, i);
+  return NULL;
+}
+
 /* Turn VALUE into a string with commas.  */
 
 char *
@@ -110,43 +154,6 @@ sim_add_commas (char *buf, int sizeof_buf, unsigned long value)
   return endbuf;
 }
 
-/* Make a copy of ARGV.
-   This can also be used to copy the environment vector.
-   The result is a pointer to the malloc'd copy or NULL if insufficient
-   memory available.  */
-
-char **
-sim_copy_argv (argv)
-     char **argv;
-{
-  int argc;
-  char **copy;
-
-  if (argv == NULL)
-    return NULL;
-
-  /* the vector */
-  for (argc = 0; argv[argc] != NULL; argc++);
-  copy = (char **) malloc ((argc + 1) * sizeof (char *));
-  if (copy == NULL)
-    return NULL;
-
-  /* the strings */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    {
-      int len = strlen (argv[argc]);
-      copy[argc] = malloc (sizeof (char *) * (len + 1));
-      if (copy[argc] == NULL)
-       {
-         freeargv (copy);
-         return NULL;
-       }
-      strcpy (copy[argc], argv[argc]);
-    }
-  copy[argc] = NULL;
-  return copy;
-}
-
 /* Analyze a prog_name/prog_bfd and set various fields in the state
    struct.  */
 
@@ -194,6 +201,14 @@ sim_analyze_program (sd, prog_name, prog_bfd)
     }
   if (STATE_ARCHITECTURE (sd) != NULL)
     bfd_set_arch_info (prog_bfd, STATE_ARCHITECTURE (sd));
+  else
+    {
+      if (bfd_get_arch (prog_bfd) != bfd_arch_unknown
+         && bfd_get_arch (prog_bfd) != bfd_arch_obscure)
+       {
+         STATE_ARCHITECTURE (sd) = bfd_get_arch_info (prog_bfd);
+       }
+    }
 
   /* update the sim structure */
   if (STATE_PROG_BFD (sd) != NULL)
@@ -223,13 +238,13 @@ sim_elapsed_time_get ()
 #ifdef HAVE_GETRUSAGE
   struct rusage mytime;
   if (getrusage (RUSAGE_SELF, &mytime) == 0)
-    return (SIM_ELAPSED_TIME) (((double) mytime.ru_utime.tv_sec * 1000) + (((double) mytime.ru_utime.tv_usec + 500) / 1000));
-  return 0;
+    return 1 + (SIM_ELAPSED_TIME) (((double) mytime.ru_utime.tv_sec * 1000) + (((double) mytime.ru_utime.tv_usec + 500) / 1000));
+  return 1;
 #else
 #ifdef HAVE_TIME
-  return (SIM_ELAPSED_TIME) time ((time_t) 0);
+  return 1 + (SIM_ELAPSED_TIME) time ((time_t) 0);
 #else
-  return 0;
+  return 1;
 #endif
 #endif
 }
@@ -251,3 +266,20 @@ sim_elapsed_time_since (start)
 #endif
 #endif
 }
+
+
+
+/* do_command but with printf style formatting of the arguments */
+void
+sim_do_commandf (SIM_DESC sd,
+                const char *fmt,
+                ...)
+{
+  va_list ap;
+  char *buf;
+  va_start (ap, fmt);
+  vasprintf (&buf, fmt, ap);
+  sim_do_command (sd, buf);
+  va_end (ap);
+  free (buf);
+}