public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-9092] libgcc, aarch64: Allow for BE platforms in heap trampolines.
@ 2024-02-21 7:54 Iain D Sandoe
0 siblings, 0 replies; only message in thread
From: Iain D Sandoe @ 2024-02-21 7:54 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:c0a80af4a1d70562dd6671047fe6dd92dcc3f544
commit r14-9092-gc0a80af4a1d70562dd6671047fe6dd92dcc3f544
Author: Iain Sandoe <iain@sandoe.co.uk>
Date: Sun Feb 18 06:52:47 2024 +0000
libgcc, aarch64: Allow for BE platforms in heap trampolines.
This arranges that the byte order of the instruction sequences is
independent of the byte order of memory.
libgcc/ChangeLog:
* config/aarch64/heap-trampoline.c
(aarch64_trampoline_insns): Arrange to encode instructions as a
byte array so that the order is independent of memory byte order.
(struct aarch64_trampoline): Likewise.
Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
Diff:
---
libgcc/config/aarch64/heap-trampoline.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/libgcc/config/aarch64/heap-trampoline.c b/libgcc/config/aarch64/heap-trampoline.c
index 1e3460b1601d..885df629da71 100644
--- a/libgcc/config/aarch64/heap-trampoline.c
+++ b/libgcc/config/aarch64/heap-trampoline.c
@@ -30,23 +30,23 @@ void __gcc_nested_func_ptr_created (void *chain, void *func, void *dst);
void __gcc_nested_func_ptr_deleted (void);
#if defined(__linux__)
-static const uint32_t aarch64_trampoline_insns[] = {
- 0xd503245f, /* hint 34 */
- 0x580000b1, /* ldr x17, .+20 */
- 0x580000d2, /* ldr x18, .+24 */
- 0xd61f0220, /* br x17 */
- 0xd5033f9f, /* dsb sy */
- 0xd5033fdf /* isb */
+static const unsigned char aarch64_trampoline_insns[6][4] = {
+ {0x5f, 0x24, 0x03, 0xd5}, /* hint 34 */
+ {0xb1, 0x00, 0x00, 0x58}, /* ldr x17, .+20 */
+ {0xd2, 0x00, 0x00, 0x58}, /* ldr x18, .+24 */
+ {0x20, 0x02, 0x1f, 0xd6}, /* br x17 */
+ {0x9f, 0x3f, 0x03, 0xd5}, /* dsb sy */
+ {0xdf, 0x3f, 0x03, 0xd5} /* isb */
};
#elif __APPLE__
-static const uint32_t aarch64_trampoline_insns[] = {
- 0xd503245f, /* hint 34 */
- 0x580000b1, /* ldr x17, .+20 */
- 0x580000d0, /* ldr x16, .+24 */
- 0xd61f0220, /* br x17 */
- 0xd5033f9f, /* dsb sy */
- 0xd5033fdf /* isb */
+static const unsigned char aarch64_trampoline_insns[6][4] = {
+ {0x5f, 0x24, 0x03, 0xd5}, /* hint 34 */
+ {0xb1, 0x00, 0x00, 0x58}, /* ldr x17, .+20 */
+ {0xd0, 0x00, 0x00, 0x58}, /* ldr x16, .+24 */
+ {0x20, 0x02, 0x1f, 0xd6}, /* br x17 */
+ {0x9f, 0x3f, 0x03, 0xd5}, /* dsb sy */
+ {0xdf, 0x3f, 0x03, 0xd5} /* isb */
};
#else
@@ -54,7 +54,7 @@ static const uint32_t aarch64_trampoline_insns[] = {
#endif
struct aarch64_trampoline {
- uint32_t insns[6];
+ unsigned char insns[6][4];
void *func_ptr;
void *chain_ptr;
};
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-02-21 7:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-21 7:54 [gcc r14-9092] libgcc, aarch64: Allow for BE platforms in heap trampolines Iain D Sandoe
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).