sim: use STATE_MAGIC helper

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

diff --git a/sim/common/sim-abort.c b/sim/common/sim-abort.c
index 088bf201a6854378f557bc719066a2ec3364a981..6d2c8ba61be3268b5a43d408ba39565b434fdb97 100644 (file)
--- a/sim/common/sim-abort.c
+++ b/sim/common/sim-abort.c
@@ -1,22 +1,21 @@
 /* Generic simulator abort.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997-2016 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
 
 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 <stdio.h>
 
@@ -28,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
    jump right out of the simulator.
 
    It is intended as a holder for simulators that have started to use
-   sim-core et.al. but are not yet in a position to use sim-engine
+   sim-core et al. but are not yet in a position to use sim-engine
    (the setjmp/longjmp code). */
 
 
@@ -43,17 +42,17 @@ sim_engine_abort (SIM_DESC sd,
   if (sd != NULL)
     {
       va_list ap;
-      va_start(ap, fmt);
+      va_start (ap, fmt);
       sim_io_evprintf (sd, fmt, ap);
-      va_end(ap);
+      va_end (ap);
       sim_io_error (sd, "\n");
     }
   else
     {
       va_list ap;
-      va_start(ap, fmt);
+      va_start (ap, fmt);
       vfprintf (stderr, fmt, ap);
-      va_end(ap);
+      va_end (ap);
       fprintf (stderr, "\n");
       abort ();
     }