From: Richard Earnshaw <Richard.Earnshaw@foss.arm.com>
To: "Victor L. Do Nascimento" <victor.donascimento@arm.com>,
newlib@sourceware.org
Cc: Richard.Earnshaw@arm.com
Subject: Re: [PATCH v4 3/8] newlib: libc: strlen M-profile PACBTI-enablement
Date: Tue, 22 Nov 2022 15:20:17 +0000 [thread overview]
Message-ID: <3feae8ef-d8db-1857-2e2e-368db885567b@foss.arm.com> (raw)
In-Reply-To: <yw8jy1t2kdr6.fsf@arm.com>
On 26/10/2022 12:47, Victor L. Do Nascimento wrote:
> Add function prologue/epilogue to conditionally add BTI landing pads
> and/or PAC code generation & authentication instructions depending on
> compilation flags.
>
> This patch enables PACBTI for all relevant variants of strlen:
> * Newlib for armv8.1-m.main+pacbti
> * Newlib for armv8.1-m.main+pacbti+mve
> * Newlib-nano
This is OK. It's slightly unfortunate that we can nolonger have the PLD
instruction before the prologue, but it is what it is.
R.
> ---
> newlib/libc/machine/arm/strlen-armv7.S | 17 ++++++++++++++---
> newlib/libc/machine/arm/strlen-thumb2-Os.S | 14 +++++++++++---
> 2 files changed, 25 insertions(+), 6 deletions(-)
>
> diff --git a/newlib/libc/machine/arm/strlen-armv7.S b/newlib/libc/machine/arm/strlen-armv7.S
> index f3dda0d60..27094040c 100644
> --- a/newlib/libc/machine/arm/strlen-armv7.S
> +++ b/newlib/libc/machine/arm/strlen-armv7.S
> @@ -59,6 +59,7 @@
> OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
>
> #include "acle-compat.h"
> +#include "arm_asm.h"
>
> .macro def_fn f p2align=0
> .text
> @@ -78,7 +79,11 @@
>
> /* This code requires Thumb. */
> #if __ARM_ARCH_PROFILE == 'M'
> +#if __ARM_ARCH >= 8
> + /* keep config inherited from -march=. */
> +#else
> .arch armv7e-m
> +#endif /* if __ARM_ARCH >= 8 */
> #else
> .arch armv6t2
> #endif
> @@ -100,8 +105,10 @@
> #define tmp2 r5
>
> def_fn strlen p2align=6
> + .fnstart
> + .cfi_startproc
> + prologue 4 5 push_ip=HAVE_PAC_LEAF
> pld [srcin, #0]
> - strd r4, r5, [sp, #-8]!
> bic src, srcin, #7
> mvn const_m1, #0
> ands tmp1, srcin, #7 /* (8 - bytes) to alignment. */
> @@ -151,6 +158,7 @@ def_fn strlen p2align=6
> beq .Lloop_aligned
>
> .Lnull_found:
> + .cfi_remember_state
> cmp data1a, #0
> itt eq
> addeq result, result, #4
> @@ -159,11 +167,11 @@ def_fn strlen p2align=6
> rev data1a, data1a
> #endif
> clz data1a, data1a
> - ldrd r4, r5, [sp], #8
> add result, result, data1a, lsr #3 /* Bits -> Bytes. */
> - bx lr
> + epilogue 4 5 push_ip=HAVE_PAC_LEAF
>
> .Lmisaligned8:
> + .cfi_restore_state
> ldrd data1a, data1b, [src]
> and tmp2, tmp1, #3
> rsb result, tmp1, #0
> @@ -177,4 +185,7 @@ def_fn strlen p2align=6
> movne data1a, const_m1
> mov const_0, #0
> b .Lstart_realigned
> + .cfi_endproc
> + .cantunwind
> + .fnend
> .size strlen, . - strlen
> diff --git a/newlib/libc/machine/arm/strlen-thumb2-Os.S b/newlib/libc/machine/arm/strlen-thumb2-Os.S
> index 961f41a0a..a46db573c 100644
> --- a/newlib/libc/machine/arm/strlen-thumb2-Os.S
> +++ b/newlib/libc/machine/arm/strlen-thumb2-Os.S
> @@ -25,6 +25,7 @@
> OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
>
> #include "acle-compat.h"
> +#include "arm_asm.h"
>
> .macro def_fn f p2align=0
> .text
> @@ -33,8 +34,9 @@
> .type \f, %function
> \f:
> .endm
> -
> -#if __ARM_ARCH_ISA_THUMB >= 2 && __ARM_ARCH >= 7
> +#if __ARM_ARCH_PROFILE == 'M' && __ARM_ARCH >= 8
> + /* keep config inherited from -march=. */
> +#elif __ARM_ARCH_ISA_THUMB >= 2 && __ARM_ARCH >= 7
> .arch armv7
> #else
> .arch armv6t2
> @@ -44,11 +46,17 @@
> .syntax unified
>
> def_fn strlen p2align=1
> + .fnstart
> + .cfi_startproc
> + prologue
> mov r3, r0
> 1: ldrb.w r2, [r3], #1
> cmp r2, #0
> bne 1b
> subs r0, r3, r0
> subs r0, #1
> - bx lr
> + epilogue
> + .cfi_endproc
> + .cantunwind
> + .fnend
> .size strlen, . - strlen
next prev parent reply other threads:[~2022-11-22 15:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 11:37 [PATCH v4 0/8] Implement assembly cortex-M PACBTI functionality Victor L. Do Nascimento
2022-10-26 11:45 ` [PATCH v4 1/8] newlib: libc: define M-profile PACBTI-enablement macros Victor L. Do Nascimento
2022-11-22 15:04 ` Richard Earnshaw
2022-10-26 11:46 ` [PATCH v4 2/8] newlib: libc: strcmp M-profile PACBTI-enablement Victor L. Do Nascimento
2022-11-22 15:04 ` Richard Earnshaw
2022-10-26 11:47 ` [PATCH v4 3/8] newlib: libc: strlen " Victor L. Do Nascimento
2022-11-22 15:20 ` Richard Earnshaw [this message]
2022-10-26 11:49 ` [PATCH v4 4/8] newlib: libc: memchr " Victor L. Do Nascimento
2022-11-22 15:33 ` Richard Earnshaw
2022-10-26 11:50 ` [PATCH v4 5/8] newlib: libc: memcpy " Victor L. Do Nascimento
2022-11-22 16:03 ` Richard Earnshaw
2022-10-26 11:51 ` [PATCH v4 6/8] newlib: libc: setjmp/longjmp " Victor L. Do Nascimento
2022-11-22 16:17 ` Richard Earnshaw
2022-10-26 11:52 ` [PATCH v4 7/8] newlib: libc: aeabi_memmove " Victor L. Do Nascimento
2022-11-22 16:18 ` Richard Earnshaw
2022-10-26 11:53 ` [PATCH v4 8/8] newlib: libc: aeabi_memset " Victor L. Do Nascimento
2022-11-22 16:19 ` Richard Earnshaw
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3feae8ef-d8db-1857-2e2e-368db885567b@foss.arm.com \
--to=richard.earnshaw@foss.arm.com \
--cc=Richard.Earnshaw@arm.com \
--cc=newlib@sourceware.org \
--cc=victor.donascimento@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).