* Make-common.in (sim-signal.o): Add rule for.
(SIM_NEW_COMMON_OBJS): Add sim-signal.o.
* sim-abort.c: Don't include <signal.h>.
* sim-basics.h: #include "sim-signal.h".
* sim-break.c: Don't include <signal.h>.
(sim_handle_breakpoint): Replace SIGTRAP with SIM_SIGTRAP.
* sim-core.c: Don't include <signal.h>.
(SIGBUS): Delete definition.
(sim_core_signal): Replace SIGSEGV,SIGBUS with SIM_SIGSEGV,SIM_SIGBUS.
* sim-engine.c: Don't include <signal.h>.
(sim_engine_abort): Replace SIGABRT with SIM_SIGABRT.
* sim-reason.c (sim_stop_reason): Call sim_signal_to_host.
* sim-resume.c: Don't include <signal.h>.
(SIGTRAP): Delete definition.
(has_stepped): Replace SIGTRAP with SIM_SIGTRAP.
* sim-stop.c: Don't include <signal.h>.
(control_c_simulation): Replace SIGINT with SIM_SIGINT.
* sim-watch.c: Don't include <signal.h>.
(handle_watchpoint): Replace SIGINT with SIM_SIGINT.
sim-reason.c
sim-resume.c
sim-run.c
+sim-signal.c
+sim-signal.h
sim-stop.c
sim-trace.c
sim-trace.h
Tue Nov 18 15:53:45 1997 Doug Evans <devans@canuck.cygnus.com>
+ * sim-signal.c, sim-signal.h: New files.
+ * Make-common.in (sim-signal.o): Add rule for.
+ (SIM_NEW_COMMON_OBJS): Add sim-signal.o.
+ * sim-abort.c: Don't include <signal.h>.
+ * sim-basics.h: #include "sim-signal.h".
+ * sim-break.c: Don't include <signal.h>.
+ (sim_handle_breakpoint): Replace SIGTRAP with SIM_SIGTRAP.
+ * sim-core.c: Don't include <signal.h>.
+ (SIGBUS): Delete definition.
+ (sim_core_signal): Replace SIGSEGV,SIGBUS with SIM_SIGSEGV,SIM_SIGBUS.
+ * sim-engine.c: Don't include <signal.h>.
+ (sim_engine_abort): Replace SIGABRT with SIM_SIGABRT.
+ * sim-reason.c (sim_stop_reason): Call sim_signal_to_host.
+ * sim-resume.c: Don't include <signal.h>.
+ (SIGTRAP): Delete definition.
+ (has_stepped): Replace SIGTRAP with SIM_SIGTRAP.
+ * sim-stop.c: Don't include <signal.h>.
+ (control_c_simulation): Replace SIGINT with SIM_SIGINT.
+ * sim-watch.c: Don't include <signal.h>.
+ (handle_watchpoint): Replace SIGINT with SIM_SIGINT.
+
* Make-common.in (SIM_NEW_COMMON_OBJS): New variable.
* sim-base.h (CIA_ADDR): Provide default definition.
sim-module.o \
sim-options.o \
sim-profile.o \
+ sim-signal.o \
sim-trace.o \
sim-utils.o \
sim-watch.o
sim-io_h = $(srccom)/sim-io.h
sim-options_h = $(srccom)/sim-options.h
sim-break_h = $(srccom)/sim-break.h
+sim-signal_h = $(srccom)/sim-signal.h
# FIXME: If this complicated way of building .o files from ../common is
# necessary, the reason should be documented here.
sim-run.o: $(srccom)/sim-run.c $(sim_main_headers)
$(CC) -c $(srccom)/sim-run.c $(ALL_CFLAGS)
+sim-signal.o: $(srccom)/sim-signal.c $(sim_main_headers) $(sim-signal_h)
+ $(CC) -c $(srccom)/sim-signal.c $(ALL_CFLAGS)
+
sim-stop.o: $(srccom)/sim-stop.c $(sim_main_headers)
$(CC) -c $(srccom)/sim-stop.c $(ALL_CFLAGS)
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <stdio.h>
-#include <signal.h>
#include "sim-main.h"
#include "sim-assert.h"
if (!bp || !(bp->flags & SIM_BREAK_INSERTED))
return;
- sim_engine_halt (sd, STATE_CPU (sd, 0), NULL, cia, sim_stopped, SIGTRAP);
+ sim_engine_halt (sd, STATE_CPU (sd, 0), NULL, cia, sim_stopped, SIM_SIGTRAP);
}
/* Handler functions for simulator resume and suspend events. */
#include "sim-main.h"
#include "sim-assert.h"
-#include <signal.h>
-
-/* for Windows builds. signal numbers used by MSVC are mostly
- the same as non-linux unixen. */
-#ifndef SIGBUS
-# define SIGBUS 10
-#endif
-
-
/* "core" module install handler.
This is called via sim_module_install to install the "core" subsystem
case sim_core_unmapped_signal:
sim_io_eprintf (sd, "core: %d byte %s to unmaped address 0x%lx at 0x%lx\n",
nr_bytes, copy, (unsigned long) addr, (unsigned long) ip);
- sim_engine_halt (sd, cpu, NULL, cia, sim_signalled, SIGSEGV);
+ sim_engine_halt (sd, cpu, NULL, cia, sim_signalled, SIM_SIGSEGV);
break;
case sim_core_unaligned_signal:
sim_io_eprintf (sd, "core: %d byte misaligned %s to address 0x%lx at 0x%lx\n",
nr_bytes, copy, (unsigned long) addr, (unsigned long) ip);
- sim_engine_halt (sd, cpu, NULL, cia, sim_signalled, SIGBUS);
+ sim_engine_halt (sd, cpu, NULL, cia, sim_signalled, SIM_SIGBUS);
break;
default:
sim_engine_abort (sd, cpu, cia,
--- /dev/null
+/* Generic simulator stop_reason.
+ Copyright (C) 1997 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.
+
+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. */
+
+#include "sim-main.h"
+#include "sim-assert.h"
+
+/* Generic implementation of sim_stop_reason */
+
+void
+sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc)
+{
+ sim_engine *engine = NULL;
+ SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
+ engine = STATE_ENGINE (sd);
+ *reason = engine->reason;
+ switch (*reason)
+ {
+ case sim_exited :
+ *sigrc = engine->sigrc;
+ break;
+ case sim_stopped :
+ case sim_signalled :
+ *sigrc = sim_signal_to_host (sd, engine->sigrc);
+ break;
+ default :
+ abort ();
+ }
+}
--- /dev/null
+/* Simulator signal support
+ Copyright (C) 1997 Free Software Foundation, Inc.
+ Contributed by Cygnus Support
+
+This file is part of the GNU Simulators.
+
+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.
+
+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. */
+
+#include <signal.h>
+#include "sim-main.h"
+
+/* Convert SIM_SIGFOO to SIGFOO.
+ What to do when the host doesn't have SIGFOO is handled on a case by case
+ basis. Generally, in the case of passing a value back to gdb, we want gdb
+ to not think the process has died (so it can be debugged at the point of
+ failure). */
+
+#ifdef _MSC_VER
+#ifndef SIGTRAP
+#define SIGTRAP 5
+#endif
+#ifndef SIGBUS
+#define SIGBUS 10
+#endif
+#endif
+
+int
+sim_signal_to_host (SIM_DESC sd, SIM_SIGNAL sig)
+{
+ switch (sig)
+ {
+ case SIM_SIGINT :
+ return SIGINT;
+
+ case SIM_SIGABRT :
+ return SIGABRT;
+
+ case SIM_SIGILL :
+#ifdef SIGILL
+ return SIGILL;
+#else
+ return SIGSEGV;
+#endif
+
+ case SIM_SIGTRAP :
+ return SIGTRAP;
+
+ case SIM_SIGBUS :
+#ifdef SIGBUS
+ return SIGBUS;
+#else
+ return SIGSEGV;
+#endif
+
+ case SIM_SIGSEGV :
+ return SIGSEGV;
+
+ case SIM_SIGXCPU :
+#ifdef SIGXCPU
+ return SIGXCPU;
+#endif
+ break;
+ }
+
+ sim_io_eprintf (sd, "sim_signal_to_host: unknown signal: %d\n", sig);
+#ifdef SIGHUP
+ return SIGHUP; /* FIXME: Suggestions? */
+#else
+ return 1;
+#endif
+}
--- /dev/null
+/* Simulator signal support
+ Copyright (C) 1997 Free Software Foundation, Inc.
+ Contributed by Cygnus Support
+
+This file is part of the GNU Simulators.
+
+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.
+
+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. */
+
+#ifndef SIM_SIGNAL_H
+#define SIM_SIGNAL_H
+
+/* Signals we use.
+ This provides a layer between our values and host/target values. */
+
+typedef enum {
+ SIM_SIGNONE,
+ /* illegal insn */
+ SIM_SIGILL,
+ /* breakpoint */
+ SIM_SIGTRAP,
+ /* misaligned memory access */
+ SIM_SIGBUS,
+ /* tried to read/write memory that's not readable/writable */
+ SIM_SIGSEGV,
+ /* cpu limit exceeded */
+ SIM_SIGXCPU,
+ /* simulation interrupted (sim_stop called) */
+ SIM_SIGINT,
+ /* simulation aborted */
+ SIM_SIGABRT
+} SIM_SIGNAL;
+
+int sim_signal_to_host (SIM_DESC sd, SIM_SIGNAL);
+
+#endif /* SIM_SIGNAL_H */
projects / external / binutils.git / commitdiff