binutils: support for the SPARC M8 processor

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

diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c
index f038e02fff42dd496fff7a08bd0f044537b039cb..7f385a5463d7db9e4058b6e914d750f7b0de82fd 100644 (file)
--- a/sim/common/sim-utils.c
+++ b/sim/common/sim-utils.c
@@ -1,5 +1,5 @@
 /* Miscellaneous simulator utilities.
 /* Miscellaneous simulator utilities.

-   Copyright (C) 1997-1998, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2017 Free Software Foundation, Inc.

    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.


@@ -48,10 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "bfd.h"
 #include "sim-utils.h"
 
 #include "bfd.h"
 #include "sim-utils.h"
 

-/* Global pointer to all state data.
-   Set by sim_resume.  */
-struct sim_state *current_state;
-

 /* Allocate zero filled memory with xcalloc - xcalloc aborts if the
    allocation fails.  */
 
 /* Allocate zero filled memory with xcalloc - xcalloc aborts if the
    allocation fails.  */
 


@@ -105,7 +101,7 @@ sim_state_alloc (SIM_OPEN_KIND kind,
 void
 sim_state_free (SIM_DESC sd)
 {
 void
 sim_state_free (SIM_DESC sd)
 {

-  ASSERT (sd->base.magic == SIM_MAGIC_NUMBER);
+  ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);

 
 #ifdef SIM_STATE_FREE
   SIM_STATE_FREE (sd);
 
 #ifdef SIM_STATE_FREE
   SIM_STATE_FREE (sd);


@@ -211,7 +207,7 @@ sim_add_commas (char *buf, int sizeof_buf, unsigned long value)
    bfd open.  */
 
 SIM_RC
    bfd open.  */
 
 SIM_RC

-sim_analyze_program (SIM_DESC sd, char *prog_name, bfd *prog_bfd)
+sim_analyze_program (SIM_DESC sd, const char *prog_name, bfd *prog_bfd)

 {
   asection *s;
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 {
   asection *s;
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);


@@ -328,15 +324,20 @@ sim_do_commandf (SIM_DESC sd,
 {
   va_list ap;
   char *buf;
 {
   va_list ap;
   char *buf;

+  int ret;
+

   va_start (ap, fmt);
   va_start (ap, fmt);

-  if (vasprintf (&buf, fmt, ap) < 0)
+  ret = vasprintf (&buf, fmt, ap);
+  va_end (ap);
+
+  if (ret < 0)

     {
       sim_io_eprintf (sd, "%s: asprintf failed for `%s'\n",
                      STATE_MY_NAME (sd), fmt);
       return;
     }
     {
       sim_io_eprintf (sd, "%s: asprintf failed for `%s'\n",
                      STATE_MY_NAME (sd), fmt);
       return;
     }

+

   sim_do_command (sd, buf);
   sim_do_command (sd, buf);

-  va_end (ap);

   free (buf);
 }
 
   free (buf);
 }