From: Victor Do Nascimento <victor.donascimento@arm.com>
To: <newlib@sourceware.org>
Subject: [PATCH 7/8] newlib: libc: aeabi_memmove M-profile PACBTI-enablement
Date: Tue, 5 Jul 2022 14:58:17 +0100 [thread overview]
Message-ID: <20220705135818.50088-8-victor.donascimento@arm.com> (raw)
In-Reply-To: <20220705135818.50088-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.
---
.../libc/machine/arm/aeabi_memmove-thumb2.S | 42 +++++++++++++++++--
1 file changed, 38 insertions(+), 4 deletions(-)
diff --git a/newlib/libc/machine/arm/aeabi_memmove-thumb2.S b/newlib/libc/machine/arm/aeabi_memmove-thumb2.S
index e9504437b..237e63cc0 100644
--- a/newlib/libc/machine/arm/aeabi_memmove-thumb2.S
+++ b/newlib/libc/machine/arm/aeabi_memmove-thumb2.S
@@ -26,6 +26,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+ #include "pacbti.h"
+
.thumb
.syntax unified
.global __aeabi_memmove
@@ -33,8 +35,18 @@
ASM_ALIAS __aeabi_memmove4 __aeabi_memmove
ASM_ALIAS __aeabi_memmove8 __aeabi_memmove
__aeabi_memmove:
+ .fnstart
+ .cfi_startproc
+ pacbti_prologue
cmp r0, r1
push {r4}
+ .save {r4}
+ .cfi_adjust_cfa_offset 4
+#if __ARM_FEATURE_PAC_DEFAULT
+ .cfi_offset 4, -8
+#else
+ .cfi_offset 4, -4
+#endif /* __ARM_FEATURE_PAC_DEFAULT */
bls 3f
adds r3, r1, r2
cmp r0, r3
@@ -48,8 +60,18 @@ __aeabi_memmove:
strb r4, [r1, #-1]!
bne 1b
2:
- pop {r4}
- bx lr
+#if __ARM_FEATURE_PAC_DEFAULT
+ pop {r4, ip}
+ .cfi_restore 4
+ .cfi_restore 143
+ .cfi_def_cfa_offset 0
+ aut ip, lr, sp
+#else
+ pop {r4}
+ .cfi_restore 4
+ .cfi_def_cfa_offset 0
+#endif /* __ARM_FEATURE_PAC_DEFAULT */
+ bx lr
3:
cmp r2, #0
beq 2b
@@ -60,6 +82,18 @@ __aeabi_memmove:
cmp r2, r1
strb r4, [r3, #1]!
bne 4b
- pop {r4}
- bx lr
+#if __ARM_FEATURE_PAC_DEFAULT
+ pop {r4, ip}
+ .cfi_restore 4
+ .cfi_restore 143
+ .cfi_def_cfa_offset 0
+ aut ip, lr, sp
+#else
+ pop {r4}
+ .cfi_restore 4
+ .cfi_def_cfa_offset 0
+#endif /* __ARM_FEATURE_PAC_DEFAULT */
+ bx lr
+ .cfi_endproc
+ .fnend
.size __aeabi_memmove, . - __aeabi_memmove
--
2.36.1
next prev parent reply other threads:[~2022-07-05 13:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-05 13:58 [PATCH 0/8] Implement assembly cortex-M PACBTI functionality Victor Do Nascimento
2022-07-05 13:58 ` [PATCH 1/8] newlib: libc: define M-profile PACBTI-enablement macros Victor Do Nascimento
2022-07-05 13:58 ` [PATCH 2/8] newlib: libc: strcmp M-profile PACBTI-enablement Victor Do Nascimento
2022-07-05 13:58 ` [PATCH 3/8] newlib: libc: strlen " Victor Do Nascimento
2022-07-05 15:39 ` Richard Earnshaw
2022-07-05 16:30 ` Victor L. Do Nascimento
2022-07-06 9:07 ` Richard Earnshaw
2022-07-05 13:58 ` [PATCH 4/8] newlib: libc: memchr " Victor Do Nascimento
2022-07-05 13:58 ` [PATCH 5/8] newlib: libc: memcpy " Victor Do Nascimento
2022-07-05 13:58 ` [PATCH 6/8] newlib: libc: setjmp/longjmp " Victor Do Nascimento
2022-07-05 13:58 ` Victor Do Nascimento [this message]
2022-07-05 13:58 ` [PATCH 8/8] newlib: libc: aeabi_memset " Victor Do Nascimento
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=20220705135818.50088-8-victor.donascimento@arm.com \
--to=victor.donascimento@arm.com \
--cc=newlib@sourceware.org \
/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).