From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 95615 invoked by alias); 11 Jul 2018 15:18:19 -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 95557 invoked by uid 9078); 11 Jul 2018 15:18:18 -0000 Date: Wed, 11 Jul 2018 15:18:00 -0000 Message-ID: <20180711151818.95554.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Fix AArch32 semihosting SYS_EXIT call on semihosting v1. X-Act-Checkin: newlib-cygwin X-Git-Author: Tamar Christina X-Git-Refname: refs/heads/master X-Git-Oldrev: 81dc535bb9e0196203e706caa533713306b4fc2c X-Git-Newrev: 430b52911102a2ee48f1857954f2aeacc5b56dc6 X-SW-Source: 2018-q3/txt/msg00011.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=430b52911102a2ee48f1857954f2aeacc5b56dc6 commit 430b52911102a2ee48f1857954f2aeacc5b56dc6 Author: Tamar Christina Date: Wed Jul 11 13:26:16 2018 +0100 Fix AArch32 semihosting SYS_EXIT call on semihosting v1. The current SYS_EXIT has a bug that when making the call it always uses the v2 calling convention. This is undefined behavior according to the semihosting specification: https://developer.arm.com/docs/100863/latest/semihosting-operations/sys_exit-0x18 This patch fixes it by making sure v1 passes the argument directly in the register instead of in a block. And for v2 it does the same if the v2 extension isn't supported. The sequence generated now is 12424: ebfffecd bl 11f60 <_has_ext_exit_extended> 12428: e3500000 cmp r0, #0 1242c: 11a0500d movne r5, sp 12430: 059d5000 ldreq r5, [sp] 12434: e1a00004 mov r0, r4 12438: e1a01005 mov r1, r5 1243c: ef00f000 svc 0x0000f000 Signed-off-by: Tamar Christina Diff: --- libgloss/arm/_kill.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libgloss/arm/_kill.c b/libgloss/arm/_kill.c index fc77e80..278ded7 100644 --- a/libgloss/arm/_kill.c +++ b/libgloss/arm/_kill.c @@ -39,7 +39,13 @@ _kill (int pid, int sig) } } +#if SEMIHOST_V2 +if (_has_ext_exit_extended ()) return do_AngelSWI (insn, block); +else +#endif + return do_AngelSWI (insn, (void*)block[0]); + #else asm ("swi %a0" :: "i" (SWI_Exit)); #endif