diff options
| -rw-r--r-- | libgloss/arm/_exit.c | 15 | ||||
| -rw-r--r-- | libgloss/arm/_kill.c | 27 |
2 files changed, 20 insertions, 22 deletions
diff --git a/libgloss/arm/_exit.c b/libgloss/arm/_exit.c index 4a071df58..180541ece 100644 --- a/libgloss/arm/_exit.c +++ b/libgloss/arm/_exit.c @@ -1,15 +1,16 @@ #include <_ansi.h> +#include "swi.h" -int _kill (int, int) __attribute__((__noreturn__)); +int _kill_shared (int, int, int) __attribute__((__noreturn__)); void _exit (int); void _exit (int status) { - /* There is only one SWI for both _exit and _kill. For _exit, call - the SWI with the second argument set to -1, an invalid value for - signum, so that the SWI handler can distinguish the two calls. - Note: The RDI implementation of _kill throws away both its - arguments. */ - _kill (status, -1); + /* The same SWI is used for both _exit and _kill. + For _exit, call the SWI with "reason" set to ADP_Stopped_ApplicationExit + to mark a standard exit. + Note: The RDI implementation of _kill_shared throws away all its + arguments and all implementations ignore the first argument. */ + _kill_shared (-1, status, ADP_Stopped_ApplicationExit); } diff --git a/libgloss/arm/_kill.c b/libgloss/arm/_kill.c index 34a6ffddf..69f985653 100644 --- a/libgloss/arm/_kill.c +++ b/libgloss/arm/_kill.c @@ -2,16 +2,27 @@ #include <signal.h> #include "swi.h" -int _kill (int, int) __attribute__((__noreturn__)); +int _kill_shared (int, int, int) __attribute__((__noreturn__)); +int _kill (int, int); int _kill (int pid, int sig) { + if (sig == SIGABRT) + _kill_shared (pid, sig, ADP_Stopped_RunTimeError); + else + _kill_shared (pid, sig, ADP_Stopped_ApplicationExit); +} + +int +_kill_shared (int pid, int sig, int reason) +{ (void) pid; (void) sig; #ifdef ARM_RDI_MONITOR /* Note: The pid argument is thrown away. */ int block[2]; block[1] = sig; + block[0] = reason; int insn; #if SEMIHOST_V2 @@ -25,20 +36,6 @@ _kill (int pid, int sig) insn = AngelSWI_Reason_ReportException; } - switch (sig) - { - case SIGABRT: - { - block[0] = ADP_Stopped_RunTimeError; - break; - } - default: - { - block[0] = ADP_Stopped_ApplicationExit; - break; - } - } - #if SEMIHOST_V2 if (_has_ext_exit_extended ()) do_AngelSWI (insn, block); |