From: Yury Norov <ynorov@caviumnetworks.com>
To: <libc-alpha@sourceware.org>, <linux-kernel@vger.kernel.org>
Cc: <arnd@arndb.de>, <catalin.marinas@arm.com>,
<marcus.shawcroft@arm.com>, <philb@gnu.org>,
<davem@davemloft.net>, <szabolcs.nagy@arm.com>,
<maxim.kuvyrkov@linaro.org>, <joseph@codesourcery.com>,
<pinskia@gmail.com>, <bamvor.zhangjian@huawei.com>,
<schwab@suse.de>, <fweimer@redhat.com>,
<Prasun.Kapoor@cavium.com>, <cmetcalf@mellanox.com>,
<hjl.tools@gmail.com>, <adhemerval.zanella@linaro.org>,
Andrew Pinski <apinski@cavium.com>,
Yury Norov <ynorov@caviumnetworks.com>
Subject: [PATCH 04/23] [AARCH64] Add PTR_REG, PTR_LOG_SIZE, and PTR_SIZE. Use it in LDST_PCREL and LDST_GLOBAL.
Date: Tue, 28 Jun 2016 16:40:00 -0000 [thread overview]
Message-ID: <1467131978-669-5-git-send-email-ynorov@caviumnetworks.com> (raw)
In-Reply-To: <1467131978-669-1-git-send-email-ynorov@caviumnetworks.com>
From: Andrew Pinski <apinski@cavium.com>
This patch adds a few extra macros which are useful for ILP32 and updates
PTR_MANGLE and PTR_DEMANGLE to use the some of the new macros.
* sysdeps/aarch64/sysdep.h (PTR_REG): New macro.
(PTR_LOG_SIZE): New macro.
(PTR_SIZE): New macro.
(LDST_PCREL): Use arguments as register numbers rather register names.
Use PTR_REG for the register when loading.
* sysdeps/unix/sysv/linux/aarch64/sysdep.h (PTR_MANGLE): Add a comment
about that the arguments are register numbers rather register names.
(PTR_DEMANGLE): Likewise.
* sysdeps/aarch64/__longjmp.S (__longjmp): Update calls to PTR_DEMANGLE.
* sysdeps/aarch64/setjmp.S (__sigsetjmp): Update calls to PTR_MANGLE.
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
---
sysdeps/aarch64/__longjmp.S | 4 ++--
sysdeps/aarch64/setjmp.S | 4 ++--
sysdeps/aarch64/sysdep.h | 28 ++++++++++++++++++----------
sysdeps/unix/sysv/linux/aarch64/sysdep.h | 8 ++++++--
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/sysdeps/aarch64/__longjmp.S b/sysdeps/aarch64/__longjmp.S
index 65116be..58332be 100644
--- a/sysdeps/aarch64/__longjmp.S
+++ b/sysdeps/aarch64/__longjmp.S
@@ -53,7 +53,7 @@ ENTRY (__longjmp)
ldp x27, x28, [x0, #JB_X27<<3]
#ifdef PTR_DEMANGLE
ldp x29, x4, [x0, #JB_X29<<3]
- PTR_DEMANGLE (x30, x4, x3, x2)
+ PTR_DEMANGLE (30, 4, 3, 2)
#else
ldp x29, x30, [x0, #JB_X29<<3]
#endif
@@ -98,7 +98,7 @@ ENTRY (__longjmp)
cfi_same_value(d15)
#ifdef PTR_DEMANGLE
ldr x4, [x0, #JB_SP<<3]
- PTR_DEMANGLE (x5, x4, x3, x2)
+ PTR_DEMANGLE (5, 4, 3, 2)
#else
ldr x5, [x0, #JB_SP<<3]
#endif
diff --git a/sysdeps/aarch64/setjmp.S b/sysdeps/aarch64/setjmp.S
index 22f4368..da83f19 100644
--- a/sysdeps/aarch64/setjmp.S
+++ b/sysdeps/aarch64/setjmp.S
@@ -42,7 +42,7 @@ ENTRY (__sigsetjmp)
stp x27, x28, [x0, #JB_X27<<3]
#ifdef PTR_MANGLE
- PTR_MANGLE (x4, x30, x3, x2)
+ PTR_MANGLE (4, 30, 3, 2)
stp x29, x4, [x0, #JB_X29<<3]
#else
stp x29, x30, [x0, #JB_X29<<3]
@@ -57,7 +57,7 @@ ENTRY (__sigsetjmp)
stp d14, d15, [x0, #JB_D14<<3]
#ifdef PTR_MANGLE
mov x4, sp
- PTR_MANGLE (x5, x4, x3, x2)
+ PTR_MANGLE (5, 4, 3, 2)
str x5, [x0, #JB_SP<<3]
#else
mov x2, sp
diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
index 05d6f8e..4ce0945 100644
--- a/sysdeps/aarch64/sysdep.h
+++ b/sysdeps/aarch64/sysdep.h
@@ -23,10 +23,16 @@
#ifdef __LP64__
# define AARCH64_R(NAME) R_AARCH64_ ## NAME
+# define PTR_REG(n) x##n
+# define PTR_LOG_SIZE 3
#else
# define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME
+# define PTR_REG(n) w##n
+# define PTR_LOG_SIZE 2
#endif
+#define PTR_SIZE (1<<PTR_LOG_SIZE)
+
#ifdef __ASSEMBLER__
/* Syntactic details of assembler. */
@@ -87,16 +93,18 @@
# define L(name) .L##name
#endif
-/* Load or store to/from a pc-relative EXPR into/from R, using T. */
-#define LDST_PCREL(OP, R, T, EXPR) \
- adrp T, EXPR; \
- OP R, [T, #:lo12:EXPR];\
-
-/* Load or store to/from a got-relative EXPR into/from R, using T. */
-#define LDST_GLOBAL(OP, R, T, EXPR) \
- adrp T, :got:EXPR; \
- ldr T, [T, #:got_lo12:EXPR];\
- OP R, [T];
+/* Load or store to/from a pc-relative EXPR into/from R, using T.
+ Note R and T are register numbers and not register names. */
+#define LDST_PCREL(OP, R, T, EXPR) \
+ adrp x##T, EXPR; \
+ OP PTR_REG (R), [x##T, #:lo12:EXPR]; \
+
+/* Load or store to/from a got-relative EXPR into/from R, using T.
+ Note R and T are register numbers and not register names. */
+#define LDST_GLOBAL(OP, R, T, EXPR) \
+ adrp x##T, :got:EXPR; \
+ ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \
+ OP PTR_REG (R), [x##T];
/* Since C identifiers are not normally prefixed with an underscore
on this system, the asm identifier `syscall_error' intrudes on the
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index a397e50..1ffabc2 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -250,12 +250,14 @@
(!defined SHARED && (IS_IN (libc) \
|| IS_IN (libpthread))))
# ifdef __ASSEMBLER__
+/* Note, dst, src, guard, and tmp are all register numbers rather than
+ register names so they will work with both ILP32 and LP64. */
# define PTR_MANGLE(dst, src, guard, tmp) \
LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \
PTR_MANGLE2 (dst, src, guard)
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
# define PTR_MANGLE2(dst, src, guard)\
- eor dst, src, guard
+ eor x##dst, x##src, x##guard
# define PTR_DEMANGLE(dst, src, guard, tmp)\
PTR_MANGLE (dst, src, guard, tmp)
# define PTR_DEMANGLE2(dst, src, guard)\
@@ -268,12 +270,14 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
# endif
#else
# ifdef __ASSEMBLER__
+/* Note, dst, src, guard, and tmp are all register numbers rather than
+ register names so they will work with both ILP32 and LP64. */
# define PTR_MANGLE(dst, src, guard, tmp) \
LDST_GLOBAL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard)); \
PTR_MANGLE2 (dst, src, guard)
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
# define PTR_MANGLE2(dst, src, guard)\
- eor dst, src, guard
+ eor x##dst, x##src, x##guard
# define PTR_DEMANGLE(dst, src, guard, tmp)\
PTR_MANGLE (dst, src, guard, tmp)
# define PTR_DEMANGLE2(dst, src, guard)\
--
2.7.4
next prev parent reply other threads:[~2016-06-28 16:40 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-28 16:40 [RFC2 PATCH 00/23] ARM64: support ILP32 Yury Norov
2016-06-28 16:40 ` [PATCH 05/23] [AARCH64] Use PTR_REG in crti.S Yury Norov
2016-06-28 17:05 ` Joseph Myers
2016-06-28 16:40 ` [PATCH 01/23] [AARCH64] define word size for lp64 and ilp32 Yury Norov
2016-06-28 17:00 ` Joseph Myers
2016-06-28 17:31 ` Joseph Myers
2016-06-28 16:40 ` Yury Norov [this message]
2016-06-28 16:40 ` [PATCH 03/23] Add dynamic ILP32 AARCH64 relocations to elf.h Yury Norov
2016-06-28 17:03 ` Joseph Myers
2016-06-28 16:40 ` [PATCH 02/23] [AARCH64] Add header guards to sysdep.h headers Yury Norov
2016-06-28 16:41 ` [PATCH 06/23] [AARCH64] Use PTR_REG/PTR_SIZE/PTR_SIZE_LOG in dl-tlsesc.S Yury Norov
2016-06-28 17:06 ` Joseph Myers
2016-06-28 16:41 ` [PATCH 07/23] [AARCH64] Use PTR_* macros in dl-trampoline.S Yury Norov
2016-06-28 16:41 ` [PATCH 09/23] [AARCH64] Use PTR_REG in getcontext.S Yury Norov
2016-06-28 16:42 ` [PATCH 08/23] [AARCH64] Use PTR_* in start.S Yury Norov
2016-06-28 16:42 ` [PATCH 14/23] [AARCH64] Add ILP32 ld.so to the known interpreter names Yury Norov
2016-06-28 16:42 ` [PATCH 13/23] [AARCH64] Add support to ldconfig for ILP32 and libilp32 Yury Norov
2016-06-28 16:42 ` [PATCH 12/23] [AARCH64] Add ILP32 to makefiles Yury Norov
2016-06-28 16:42 ` [PATCH 16/23] [AARCH64] Make lp64 and ilp32 directories Yury Norov
2016-06-28 17:10 ` Joseph Myers
2016-06-29 8:44 ` Andreas Schwab
2016-06-28 16:42 ` [PATCH 11/23] [AARCH64] Add ILP32 support to elf_machine_load_address Yury Norov
2016-06-28 16:43 ` [PATCH 21/23] [AARCH64] Make __SIZEOF_SEM_T 16 for ILP32 Yury Norov
2016-06-28 17:16 ` Joseph Myers
2016-06-29 7:55 ` Andreas Schwab
2016-06-28 16:43 ` [PATCH 15/23] [AARCH64] Add ldd-rewrite.sed so that ilp32 ld.so can be found Yury Norov
2016-06-28 16:43 ` [PATCH 23/23] [AARCH64] Take utmp{,x}.h from s390 port Yury Norov
2016-06-28 17:18 ` Joseph Myers
2016-06-28 18:00 ` Yury Norov
2016-06-28 20:39 ` Joseph Myers
2016-06-28 20:43 ` Adhemerval Zanella
2016-06-28 16:43 ` [PATCH 17/23] [AARCH64] ILP32: introduce syscalls that pass off_t Yury Norov
2016-06-28 17:13 ` Joseph Myers
2016-06-29 10:11 ` Andreas Schwab
2016-06-29 12:05 ` Andreas Schwab
2016-06-28 16:43 ` [PATCH 19/23] [AARCH64] delouse input arguments in system functions Yury Norov
2016-06-28 17:15 ` Joseph Myers
2016-06-29 7:49 ` Andreas Schwab
2016-06-28 16:43 ` [PATCH 20/23] [AARCH64] Fix ILP32 warning Yury Norov
2016-06-28 16:43 ` [PATCH 22/23] off_t: fix register pair calculation for 64-bit case Yury Norov
2016-06-28 17:17 ` Joseph Myers
2016-06-28 16:43 ` [PATCH 10/23] [AARCH64] Detect ILP32 in configure scripts Yury Norov
2016-06-28 17:08 ` Joseph Myers
2016-06-28 17:31 ` Yury Norov
2016-06-28 17:36 ` Joseph Myers
2016-06-28 16:43 ` [PATCH 18/23] [AARCH64] ILP32: support stat syscall family Yury Norov
2016-06-28 17:15 ` Joseph Myers
2016-06-28 19:08 ` Yury Norov
2016-06-28 20:42 ` Adhemerval Zanella
2016-06-28 20:46 ` Joseph Myers
2016-06-29 6:57 ` Andreas Schwab
2016-06-29 9:21 ` Andreas Schwab
2016-06-28 16:57 ` [RFC2 PATCH 00/23] ARM64: support ILP32 Joseph Myers
2016-06-28 17:32 ` Adhemerval Zanella
2016-07-05 7:34 ` Andreas Schwab
2016-07-08 15:12 ` Yury Norov
2016-09-08 4:36 ` Zhangjian (Bamvor)
2016-09-08 11:38 ` Yury Norov
2016-09-08 11:59 ` Zhangjian (Bamvor)
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=1467131978-669-5-git-send-email-ynorov@caviumnetworks.com \
--to=ynorov@caviumnetworks.com \
--cc=Prasun.Kapoor@cavium.com \
--cc=adhemerval.zanella@linaro.org \
--cc=apinski@cavium.com \
--cc=arnd@arndb.de \
--cc=bamvor.zhangjian@huawei.com \
--cc=catalin.marinas@arm.com \
--cc=cmetcalf@mellanox.com \
--cc=davem@davemloft.net \
--cc=fweimer@redhat.com \
--cc=hjl.tools@gmail.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcus.shawcroft@arm.com \
--cc=maxim.kuvyrkov@linaro.org \
--cc=philb@gnu.org \
--cc=pinskia@gmail.com \
--cc=schwab@suse.de \
--cc=szabolcs.nagy@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).