From: Will Newton <will.newton@linaro.org>
To: Andrew Pinski <apinski@cavium.com>
Cc: libc-alpha <libc-alpha@sourceware.org>
Subject: Re: [PATCH 13/29] [AARCH64] Use PTR_* macros in dl-trampoline.S
Date: Tue, 18 Nov 2014 12:33:00 -0000 [thread overview]
Message-ID: <CANu=Dmg2zWgVL2qOioen9ZbreB1NJi6f7_g=DYMXsWTMq1poow@mail.gmail.com> (raw)
In-Reply-To: <1414396793-9005-14-git-send-email-apinski@cavium.com>
On 27 October 2014 07:59, Andrew Pinski <apinski@cavium.com> wrote:
> Use the PTR_* macros in dl-trampoline.S so it can be used for
> both ILP32 and LP64. Also add a comment about what was an magic number
> (the size of the rela relocation entries).
>
> * sysdeps/aarch64/dl-trampoline.S (ip0l): New define.
> (RELA_SIZE): New define.
> (_dl_runtime_resolve): Use PTR_REG, PTR_SIZE.
> (_dl_runtime_profile): Likewise. Use RELA_SIZE and ip0l.
> ---
> sysdeps/aarch64/dl-trampoline.S | 18 +++++++++++-------
> 1 files changed, 11 insertions(+), 7 deletions(-)
This looks ok to me. Not a massive fan of the name ip0l but I don't
have a better suggestion right now.
> diff --git a/sysdeps/aarch64/dl-trampoline.S b/sysdeps/aarch64/dl-trampoline.S
> index 2037f18..22b28ce 100644
> --- a/sysdeps/aarch64/dl-trampoline.S
> +++ b/sysdeps/aarch64/dl-trampoline.S
> @@ -22,9 +22,13 @@
> #include "dl-link.h"
>
> #define ip0 x16
> +#define ip0l PTR_REG (16)
> #define ip1 x17
> #define lr x30
>
> +/* RELA relocatons are 3 pointers */
> +#define RELA_SIZE (PTR_SIZE * 3)
> +
> .text
> .globl _dl_runtime_resolve
> .type _dl_runtime_resolve, #function
> @@ -79,7 +83,7 @@ _dl_runtime_resolve:
> cfi_rel_offset (q1, 80+7*16)
>
> /* Get pointer to linker struct. */
> - ldr x0, [ip0, #-8]
> + ldr PTR_REG (0), [ip0, #-PTR_SIZE]
>
> /* Prepare to call _dl_fixup(). */
> ldr x1, [sp, 80+8*16] /* Recover &PLTGOT[n] */
> @@ -87,7 +91,7 @@ _dl_runtime_resolve:
> sub x1, x1, ip0
> add x1, x1, x1, lsl #1
> lsl x1, x1, #3
> - sub x1, x1, #192
> + sub x1, x1, #(RELA_SIZE<<3)
> lsr x1, x1, #3
>
> /* Call fixup routine. */
> @@ -191,7 +195,7 @@ _dl_runtime_profile:
> stp x0, x1, [x29, #OFFSET_RG + DL_OFFSET_RG_SP]
>
> /* Get pointer to linker struct. */
> - ldr x0, [ip0, #-8]
> + ldr PTR_REG (0), [ip0, #-PTR_SIZE]
>
> /* Prepare to call _dl_profile_fixup(). */
> ldr x1, [x29, OFFSET_PLTGOTN] /* Recover &PLTGOT[n] */
> @@ -199,7 +203,7 @@ _dl_runtime_profile:
> sub x1, x1, ip0
> add x1, x1, x1, lsl #1
> lsl x1, x1, #3
> - sub x1, x1, #192
> + sub x1, x1, #(RELA_SIZE<<3)
> lsr x1, x1, #3
>
> stp x0, x1, [x29, #OFFSET_SAVED_CALL_X0]
> @@ -210,8 +214,8 @@ _dl_runtime_profile:
> add x4, x29, #OFFSET_FS /* address of framesize */
> bl _dl_profile_fixup
>
> - ldr ip0, [x29, #OFFSET_FS] /* framesize == 0 */
> - cmp ip0, #0
> + ldr ip0l, [x29, #OFFSET_FS] /* framesize == 0 */
> + cmp ip0l, #0
> bge 1f
> cfi_remember_state
>
> @@ -243,7 +247,7 @@ _dl_runtime_profile:
> 1:
> /* The new frame size is in ip0. */
>
> - sub x1, x29, ip0
> + sub PTR_REG (1), PTR_REG (29), ip0l
> and sp, x1, #0xfffffffffffffff0
>
> str x0, [x29, #OFFSET_T1]
> --
> 1.7.2.5
>
--
Will Newton
Toolchain Working Group, Linaro
next prev parent reply other threads:[~2014-11-18 12:33 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 8:00 [PATCH 00/29] Add Support for AARCH64:ILP32 Andrew Pinski
2014-10-27 8:00 ` [PATCH 27/29] [AARCH64] Fix up ucontext for ILP32 Andrew Pinski
2014-10-28 20:10 ` Mike Frysinger
2014-11-18 14:54 ` Will Newton
2014-10-27 8:00 ` [PATCH 11/29] [AARCH64] Use PTR_REG in crti.S Andrew Pinski
2014-11-18 12:09 ` Will Newton
2014-10-27 8:00 ` [PATCH 08/29] [AARCH64] Add header guards to sysdep.h headers Andrew Pinski
2014-10-27 16:32 ` Chris Metcalf
2014-10-27 8:00 ` [PATCH 02/29] Allow sigset be an array of a different type Andrew Pinski
2014-10-27 20:32 ` Roland McGrath
2014-10-27 8:00 ` [PATCH 12/29] [AARCH64] Use PTR_REG/PTR_SIZE/PTR_SIZE_LOG in dl-tlsesc.S Andrew Pinski
2014-11-18 12:23 ` Will Newton
2014-10-27 8:00 ` [PATCH 24/29] [AARCH64] Add ldd-rewrite.sed so that ilp32 ld.so can be found Andrew Pinski
2014-11-18 14:31 ` Will Newton
2014-10-27 8:00 ` [PATCH 19/29] [AARCH64] Add ILP32 support to elf_machine_load_address Andrew Pinski
2014-11-18 13:56 ` Will Newton
2014-10-27 8:00 ` [PATCH 04/29] Allow rusage work on a big-endian 32bit-on-64bit target Andrew Pinski
2014-10-28 20:05 ` Mike Frysinger
2014-10-27 8:00 ` [PATCH 15/29] [AARCH64] Use PTR_REG in getcontext.S Andrew Pinski
2014-11-18 12:37 ` Will Newton
2014-10-27 8:00 ` [PATCH 10/29] [AARCH64] Add PTR_REG, PTR_LOG_SIZE, and PTR_SIZE. Use it in LDST_PCREL and LDST_GLOBAL Andrew Pinski
2014-11-18 12:04 ` Will Newton
2014-10-27 8:00 ` [PATCH 13/29] [AARCH64] Use PTR_* macros in dl-trampoline.S Andrew Pinski
2014-11-18 12:33 ` Will Newton [this message]
2014-10-27 8:00 ` [PATCH 09/29] Add dynamic ILP32 AARCH64 relocations to elf.h Andrew Pinski
2014-10-27 20:36 ` Roland McGrath
2014-10-27 8:00 ` [PATCH 25/29] [AARCH64] Add kernel_sigaction.h for AARCH64 ILP32 Andrew Pinski
2014-11-18 14:42 ` Will Newton
2014-10-27 8:00 ` [PATCH 07/29] Allow generic stat and statfs not have padding for 32bit targets Andrew Pinski
2014-10-27 16:32 ` Chris Metcalf
2014-10-27 8:00 ` [PATCH 01/29] [AARCH64] Fix utmp struct for compatibility reasons Andrew Pinski
2014-10-27 17:57 ` Joseph S. Myers
2014-10-27 21:18 ` Andreas Schwab
2014-10-27 8:00 ` [PATCH 06/29] Allow some fields of siginfo to be different from the generic one Andrew Pinski
2014-11-18 11:31 ` Will Newton
2014-10-27 8:00 ` [PATCH 05/29] Allow fd_mask type not be an array of long Andrew Pinski
2014-10-27 16:32 ` Chris Metcalf
2014-11-18 11:24 ` Will Newton
2014-10-27 8:00 ` [PATCH 03/29] Add ability for the IPC structures (msqid_ds, semid_ds, shmid_ds, etc.) to have time_t being 64bit Andrew Pinski
2014-10-27 16:32 ` Chris Metcalf
2014-11-18 10:57 ` Will Newton
2014-10-27 8:00 ` [PATCH 18/29] [AARCH64] Reformat inline-asm in elf_machine_load_address Andrew Pinski
2014-11-18 13:51 ` Will Newton
2014-10-27 8:03 ` [PATCH 22/29] [AARCH64] Add support to ldconfig for ILP32 and libilp32 Andrew Pinski
2014-11-18 14:20 ` Will Newton
2014-10-27 8:03 ` [PATCH 26/29] [AARCH64] Add sigstack.h header for ILP32 reasons Andrew Pinski
2014-11-18 14:49 ` Will Newton
2014-10-27 8:03 ` [PATCH 16/29] [AARCH64] Detect ILP32 in configure scripts Andrew Pinski
2014-10-27 18:05 ` Joseph S. Myers
2014-10-28 20:16 ` Mike Frysinger
2014-10-28 20:18 ` Andrew Pinski
2014-10-27 8:03 ` [PATCH 20/29] [AARCH64] Set up wordsize for ILP32 Andrew Pinski
2014-11-18 13:58 ` Will Newton
2014-10-27 8:03 ` [PATCH 17/29] [AARCH64] Syscalls for ILP32 are passed always via 64bit values Andrew Pinski
2014-11-18 12:50 ` Will Newton
2014-10-27 8:03 ` [PATCH 28/29] [AARCH64] Add typesizes.h for ILP32 Andrew Pinski
2014-10-27 16:32 ` Chris Metcalf
2014-10-28 20:06 ` Mike Frysinger
2014-10-27 8:03 ` [PATCH 21/29] [AARCH64] Add ILP32 to makefiles Andrew Pinski
2014-10-28 20:14 ` Mike Frysinger
2014-10-28 22:46 ` Joseph S. Myers
2014-10-27 8:03 ` [PATCH 23/29] [AARCH64] Add ILP32 ld.so to the known interpreter names Andrew Pinski
2014-11-18 14:26 ` Will Newton
2014-10-27 8:03 ` [PATCH 29/29] [AARCH64] Make lp64 and ilp32 directories Andrew Pinski
2014-10-27 18:07 ` Joseph S. Myers
2014-10-27 8:03 ` [PATCH 14/29] [AARCH64] Use PTR_* in start.S Andrew Pinski
2014-11-18 12:35 ` Will Newton
2014-10-28 9:15 ` [PATCH 00/29] Add Support for AARCH64:ILP32 Marcus Shawcroft
2015-05-26 13:37 ` Andreas Schwab
2015-05-26 14:13 ` Pinski, Andrew
2015-05-26 14:39 ` Andreas Schwab
2015-05-26 15:10 ` Pinski, Andrew
2015-05-26 15:16 ` Andreas Schwab
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='CANu=Dmg2zWgVL2qOioen9ZbreB1NJi6f7_g=DYMXsWTMq1poow@mail.gmail.com' \
--to=will.newton@linaro.org \
--cc=apinski@cavium.com \
--cc=libc-alpha@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).