diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-11-12 14:25:40 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-11-12 14:25:40 +0100 |
| commit | aff557c74c4bff664d8b65d68444a5e2b57bd048 (patch) | |
| tree | 70ab6c0a750c1c31b4dbad5e8824d4b823c6b6af /gcc/ada/init.c | |
| parent | a989bcc3f56ee3b90a9c8d78c94d424d1629f2ec (diff) | |
| download | gcc-aff557c74c4bff664d8b65d68444a5e2b57bd048.zip gcc-aff557c74c4bff664d8b65d68444a5e2b57bd048.tar.gz gcc-aff557c74c4bff664d8b65d68444a5e2b57bd048.tar.bz2 | |
[multiple changes]
2015-11-12 Bob Duff <duff@adacore.com>
* impunit.adb, lib-xref.ads, restrict.ads, scos.ads, sem_attr.ads,
types.ads: Get rid of some global variables.
* output.adb, output.ads: Move some global variables to the body.
2015-11-12 Yannick Moy <moy@adacore.com>
* lib-xref-spark_specific.adb
(Is_Constant_Object_Without_Variable_Input): Add special case
for imported constants.
2015-11-12 Philippe Gil <gil@adacore.com>
* g-debpoo.adb (Allocate): Avoid having allocations not handled.
2015-11-12 Ed Schonberg <schonberg@adacore.com>
* checks.adb (Apply_Scalar_Range_Check): If the expression is
a real literal and the context type has static bounds, remove
range check when possible.
2015-11-12 Ed Schonberg <schonberg@adacore.com>
* sem_util.adb (Collect_Primitive_Operations): If the type is
derived from a type declared elsewhere that has an incomplete
type declaration, the primitives are found in the scope of the
type nat that of its ancestor.
2015-11-12 Arnaud Charlet <charlet@adacore.com>
* switch-c.adb, debug.adb, osint-c.adb, gnat1drv.adb: Remove -gnatd.V
debug switch.
* exp_aggr.adb, exp_util.adb: Fix typos.
2015-11-12 Jerome Lambourg <lambourg@adacore.com>
* init.c: Properly adjust PC values in case of signals.
2015-11-12 Bob Duff <duff@adacore.com>
* sem_prag.adb (Check_Arg_Is_Library_Level_Local_Name): A
pragma that comes from an aspect does not "come from source",
so we need to test whether it comes from an aspect.
From-SVN: r230253
Diffstat (limited to 'gcc/ada/init.c')
| -rw-r--r-- | gcc/ada/init.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 59fc335..4acf1a2 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -1911,6 +1911,41 @@ __gnat_vxsim_error_handler (int sig, siginfo_t *si, void *sc); static int is_vxsim = 0; #endif +#if defined (ARMEL) && (_WRS_VXWORKS_MAJOR >= 7) + +/* ARM-vx7 case with arm unwinding exceptions */ +#define HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE + +#include <arch/../regs.h> +#ifndef __RTP__ +#include <sigLib.h> +#else +#include <signal.h> +#include <regs.h> +#include <ucontext.h> +#endif /* __RTP__ */ + +void +__gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED, + void *sc ATTRIBUTE_UNUSED) +{ + /* In case of ARM exceptions, the registers context have the PC pointing + to the instruction that raised the signal. However the Unwinder expects + the instruction to be in the range ]PC,PC+1]. + */ + uintptr_t *pc_addr; /* address of the pc value to restore */ +#ifdef __RTP__ + mcontext_t *mcontext = &((ucontext_t *) sc)->uc_mcontext; + pc_addr = (uintptr_t*)&mcontext->regs.pc; +#else + struct sigcontext * sctx = (struct sigcontext *) sc; + pc_addr = (uintptr_t*)&sctx->sc_pregs->pc; +#endif + /* ARM Bump has to be an even number because of odd/even architecture. */ + *pc_addr += 2; +} +#endif /* ARMEL && _WRS_VXWORKS_MAJOR >= 7 */ + /* Tasking and Non-tasking signal handler. Map SIGnal to Ada exception propagation after the required low level adjustments. */ @@ -1958,6 +1993,10 @@ __gnat_error_handler (int sig, siginfo_t *si, void *sc) __gnat_vxsim_error_handler (sig, si, sc); #endif +#ifdef HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE + __gnat_adjust_context_for_raise (sig, sc); +#endif + #include "sigtramp.h" __gnat_sigtramp (sig, (void *)si, (void *)sc, |