From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 124583 invoked by alias); 26 Nov 2018 15:08:17 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 124532 invoked by uid 447); 26 Nov 2018 15:08:17 -0000 Date: Mon, 26 Nov 2018 15:08:00 -0000 Message-ID: <20181126150817.124529.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jeff Johnston To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Builtin enable return code with SYS_EXIT_EXTENDED X-Act-Checkin: newlib-cygwin X-Git-Author: Matthew Malcomson X-Git-Refname: refs/heads/master X-Git-Oldrev: 7e72be1c390cb771ef54db4df50d4041bdaa1488 X-Git-Newrev: 2d6b71ee6d3459658ebe73c5cb262023b86f472e X-SW-Source: 2018-q4/txt/msg00030.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2d6b71ee6d3459658ebe73c5cb262023b86f472e commit 2d6b71ee6d3459658ebe73c5cb262023b86f472e Author: Matthew Malcomson Date: Fri Nov 16 11:45:48 2018 +0000 Builtin enable return code with SYS_EXIT_EXTENDED A previous commit introduced the ability to use the semi-hosting SYS_EXIT_EXTENDED operation to libgloss, this commit adds the same ability to the sys/arm/ backend so that building newlib only will provide the same capabilities. Diff: --- newlib/libc/sys/arm/syscalls.c | 62 +++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c index 87ddca7..b521074 100644 --- a/newlib/libc/sys/arm/syscalls.c +++ b/newlib/libc/sys/arm/syscalls.c @@ -30,7 +30,7 @@ int _stat (const char *, struct stat *); int _fstat (int, struct stat *); void * _sbrk (ptrdiff_t); pid_t _getpid (void); -int _kill (int, int) __attribute__((__noreturn__)); +int _kill (int, int); void _exit (int); int _close (int); int _swiclose (int); @@ -49,6 +49,7 @@ static int error (int); static int get_errno (void); static int remap_handle (int); static int findslot (int); +static int _kill_shared (int, int, int) __attribute__((__noreturn__)); /* Register name faking - works in collusion with the linker. */ register char * stack_ptr asm ("sp"); @@ -424,21 +425,35 @@ _close (int file) return wrap (_swiclose (file)); } -int -_kill (int pid, int sig) +static int +_kill_shared (int pid, int sig, int reason) { - (void)pid; (void)sig; + (void) pid; (void) sig; #ifdef ARM_RDI_MONITOR /* Note: The pid argument is thrown away. */ - switch (sig) { - case SIGABRT: - do_AngelSWI (AngelSWI_Reason_ReportException, - (void *) ADP_Stopped_RunTimeError); - __builtin_unreachable(); - default: - do_AngelSWI (AngelSWI_Reason_ReportException, - (void *) ADP_Stopped_ApplicationExit); - } + int block[2]; + block[1] = sig; + block[0] = reason; + int insn; + +#if SEMIHOST_V2 + if (_has_ext_exit_extended ()) + { + insn = AngelSWI_Reason_ReportExceptionExtended; + } + else +#endif + { + insn = AngelSWI_Reason_ReportException; + } + +#if SEMIHOST_V2 +if (_has_ext_exit_extended ()) + do_AngelSWI (insn, block); +else +#endif + do_AngelSWI (insn, (void*)block[0]); + #else asm ("swi %a0" :: "i" (SWI_Exit)); #endif @@ -446,15 +461,24 @@ _kill (int pid, int sig) __builtin_unreachable(); } +int +_kill (int pid, int sig) +{ + if (sig == SIGABRT) + _kill_shared (pid, sig, ADP_Stopped_RunTimeError); + else + _kill_shared (pid, sig, ADP_Stopped_ApplicationExit); +} + 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); } pid_t