X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-abort.c;h=1a6ab8431fcd9a06d4d3b3d5ce00b8ee42ab8940;hb=34b47c3828ca8e6d9dcddb2886744fb470e4276c;hp=0a441e42a38c282c0b946e12921eb7e1377be294;hpb=f03b093cd34bc352ad89334a43a34b00a5e5c60c;p=deliverable%2Fbinutils-gdb.git
diff --git a/sim/common/sim-abort.c b/sim/common/sim-abort.c
index 0a441e42a3..1a6ab8431f 100644
--- a/sim/common/sim-abort.c
+++ b/sim/common/sim-abort.c
@@ -1,35 +1,34 @@
/* Generic simulator abort.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2007, 2008, 2009, 2010, 2011
+ 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 . */
-#include "sim-main.h"
-
-#include
#include
+#include "sim-main.h"
+#include "sim-assert.h"
/* This is an implementation of sim_engine_abort that does not use
longjmp, instead it just calls sim_io_error. sim_io_error will
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). */
@@ -40,20 +39,21 @@ sim_engine_abort (SIM_DESC sd,
const char *fmt,
...)
{
+ ASSERT (sd == NULL || STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
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 ();
}