From: Victor Do Nascimento <victor.donascimento@arm.com>
To: <newlib@sourceware.org>
Cc: <richard.earnshaw@arm.com>,
Victor Do Nascimento <victor.donascimento@arm.com>
Subject: [PATCH v2 8/8] newlib: libc: aeabi_memset M-profile PACBTI-enablement
Date: Wed, 3 Aug 2022 16:35:24 +0100 [thread overview]
Message-ID: <20220803153524.20631-9-victor.donascimento@arm.com> (raw)
In-Reply-To: <20220803153524.20631-1-victor.donascimento@arm.com>
Add function prologue/epilogue to conditionally add BTI landing pads
and/or PAC code generation & authentication instructions depending on
compilation flags.
---
newlib/libc/machine/arm/aeabi_memset-thumb2.S | 47 ++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/newlib/libc/machine/arm/aeabi_memset-thumb2.S b/newlib/libc/machine/arm/aeabi_memset-thumb2.S
index eaca1d8d7..8bd4b5eaa 100644
--- a/newlib/libc/machine/arm/aeabi_memset-thumb2.S
+++ b/newlib/libc/machine/arm/aeabi_memset-thumb2.S
@@ -26,14 +26,43 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "pacbti.h"
+
.thumb
.syntax unified
.global __aeabi_memset
.type __aeabi_memset, %function
+ .fnstart
+ .cfi_startproc
ASM_ALIAS __aeabi_memset4 __aeabi_memset
ASM_ALIAS __aeabi_memset8 __aeabi_memset
__aeabi_memset:
+#if __HAVE_PAC_LEAF
+#if __ARM_FEATURE_BTI_DEFAULT
+ pacbti ip, lr, sp
+#else
+ pac ip, lr, sp
+#endif /* __ARM_FEATURE_BTI_DEFAULT */
+ .cfi_register 143, 12
+ push {r4, r5, r6, ip}
+ .save {r4, r5, r6, ra_auth_code}
+ .cfi_def_cfa_offset 16
+ .cfi_offset 4, -16
+ .cfi_offset 5, -12
+ .cfi_offset 6, -8
+ .cfi_offset 143, -4
+#else
+#if __ARM_FEATURE_BTI_DEFAULT
+ bti
+#endif /* __ARM_FEATURE_BTI_DEFAULT */
push {r4, r5, r6}
+ .save {r4, r5, r6}
+ .cfi_def_cfa_offset 12
+ .cfi_offset 4, -12
+ .cfi_offset 5, -8
+ .cfi_offset 6, -4
+#endif /* __HAVE_PAC_LEAF */
+
lsls r4, r0, #30
beq 10f
subs r4, r1, #1
@@ -98,10 +127,26 @@ __aeabi_memset:
cmp r3, r4
bne 8b
9:
+#if __HAVE_PAC_LEAF
+ pop {r4, r5, r6, ip}
+ .cfi_restore 143
+ .cfi_restore 6
+ .cfi_restore 5
+ .cfi_restore 4
+ .cfi_def_cfa_offset 0
+ aut ip, lr, sp
+#else
pop {r4, r5, r6}
- bx lr
+ .cfi_restore 6
+ .cfi_restore 5
+ .cfi_restore 4
+ .cfi_def_cfa_offset 0
+#endif /* __HAVE_PAC_LEAF */
+ bx lr
10:
mov r4, r1
mov r3, r0
b 3b
+ .cfi_endproc
+ .fnend
.size __aeabi_memset, . - __aeabi_memset
--
2.36.1
prev parent reply other threads:[~2022-08-03 15:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-03 15:35 [PATCH v2 0/8] Implement assembly cortex-M PACBTI functionality Victor Do Nascimento
2022-08-03 15:35 ` [PATCH v2 1/8] newlib: libc: define M-profile PACBTI-enablement macros Victor Do Nascimento
2022-08-04 15:19 ` Richard Earnshaw
2022-08-05 9:21 ` Victor L. Do Nascimento
2022-08-16 16:11 ` Victor L. Do Nascimento
2022-08-18 16:28 ` Victor L. Do Nascimento
2022-08-03 15:35 ` [PATCH v2 2/8] newlib: libc: strcmp M-profile PACBTI-enablement Victor Do Nascimento
2022-08-04 15:48 ` Richard Earnshaw
2022-08-05 10:51 ` Victor L. Do Nascimento
2022-08-05 14:34 ` Richard Earnshaw
2022-08-05 14:58 ` Victor L. Do Nascimento
2022-08-05 15:15 ` Richard Earnshaw
2022-08-03 15:35 ` [PATCH v2 3/8] newlib: libc: strlen " Victor Do Nascimento
2022-08-03 15:35 ` [PATCH v2 4/8] newlib: libc: memchr " Victor Do Nascimento
2022-08-03 15:35 ` [PATCH v2 5/8] newlib: libc: memcpy " Victor Do Nascimento
2022-08-03 15:35 ` [PATCH v2 6/8] newlib: libc: setjmp/longjmp " Victor Do Nascimento
2022-08-03 15:35 ` [PATCH v2 7/8] newlib: libc: aeabi_memmove " Victor Do Nascimento
2022-08-03 15:35 ` Victor Do Nascimento [this message]
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=20220803153524.20631-9-victor.donascimento@arm.com \
--to=victor.donascimento@arm.com \
--cc=newlib@sourceware.org \
--cc=richard.earnshaw@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).