From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 3133 invoked from network); 6 Dec 2021 23:44:19 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 6 Dec 2021 23:44:19 -0000 Received: (qmail 29877 invoked by uid 550); 6 Dec 2021 23:44:14 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 29839 invoked from network); 6 Dec 2021 23:44:14 -0000 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu C5A3D44753E0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be; s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1638834241; bh=dbc3yBi7bM4Nfxbx6D5qYQulke4sKRCaIcOAPxPQyCQ=; h=From:To:Date:Message-Id:MIME-Version; b=0yA2AkOV4wB20SpfGysvr9n24ArfRIq611JUHZ3I28PCN1vMpQy0XjY0PwHPmF5fx zq7drUuc7UZa/HXIxlqQ9r6GgVDuGkz5jiRf73suB0NeMNDa3WAXnmZsMfa3gLxOpe 6Psw4/pnvp3LSZOF6J8qR/SR7B8t2hWAMo0IAZ2I= X-Virus-Scanned: amavisd-new at mail.tintel.eu From: Stijn Tintel To: musl@lists.openwall.com Date: Tue, 7 Dec 2021 01:43:58 +0200 Message-Id: <20211206234358.2174444-1-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Rspamd-Pre-Result: action=no action; module=multimap; Matched map: IP_WHITELIST X-Rspamd-Queue-Id: 20E4F443B973 X-Rspamd-Pre-Result: action=no action; module=multimap; Matched map: IP_WHITELIST X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]; IP_WHITELIST(0.00)[2001:67c:21bc:20::10] X-Rspamd-Server: skulls Content-Transfer-Encoding: quoted-printable Subject: [musl] [PATCH] ppc64: check for AltiVec in setjmp/longjmp On machines without AltiVec, the lvx and stvx instructions are not supported. Use __hwcap to test if AltiVec is supported. Fixes SIGILL on PowerPC 64 processors without AltiVec support. Runtime-tested on e5500 and e6500. Signed-off-by: Stijn Tintel --- src/setjmp/powerpc64/longjmp.s | 13 ++++++++++++- src/setjmp/powerpc64/setjmp.s | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/setjmp/powerpc64/longjmp.s b/src/setjmp/powerpc64/longjm= p.s index 81d45ff6..da7172af 100644 --- a/src/setjmp/powerpc64/longjmp.s +++ b/src/setjmp/powerpc64/longjmp.s @@ -56,7 +56,17 @@ longjmp: lfd 30, 38*8(3) lfd 31, 39*8(3) =20 - # 6) restore vector registers v20-v31 + # 6) restore vector registers v20-v31 if hardware supports AltiVec + mflr 0 + bl 1f + .hidden __hwcap + .long __hwcap-. +1: mflr 4 + lwz 5, 0(4) + add 4, 4, 5 + ld 4, 0(4) + andis. 4, 4, 0x1000 + beq 1f addi 3, 3, 40*8 lvx 20, 0, 3 ; addi 3, 3, 16 lvx 21, 0, 3 ; addi 3, 3, 16 @@ -70,6 +80,7 @@ longjmp: lvx 29, 0, 3 ; addi 3, 3, 16 lvx 30, 0, 3 ; addi 3, 3, 16 lvx 31, 0, 3 +1: mtlr 0 =20 # 7) return r4 ? r4 : 1 mr 3, 4 diff --git a/src/setjmp/powerpc64/setjmp.s b/src/setjmp/powerpc64/setjmp.= s index 37683fda..32853693 100644 --- a/src/setjmp/powerpc64/setjmp.s +++ b/src/setjmp/powerpc64/setjmp.s @@ -69,7 +69,17 @@ __setjmp_toc: stfd 30, 38*8(3) stfd 31, 39*8(3) =20 - # 5) store vector registers v20-v31 + # 5) store vector registers v20-v31 if hardware supports AltiVec + mflr 0 + bl 1f + .hidden __hwcap + .long __hwcap-. +1: mflr 4 + lwz 5, 0(4) + add 4, 4, 5 + ld 4, 0(4) + andis. 4, 4, 0x1000 + beq 1f addi 3, 3, 40*8 stvx 20, 0, 3 ; addi 3, 3, 16 stvx 21, 0, 3 ; addi 3, 3, 16 @@ -83,6 +93,7 @@ __setjmp_toc: stvx 29, 0, 3 ; addi 3, 3, 16 stvx 30, 0, 3 ; addi 3, 3, 16 stvx 31, 0, 3 +1: mtlr 0 =20 # 6) return 0 li 3, 0 --=20 2.32.0