linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>, Andrew Pinski <apinski@cavium.com>,
	Yury Norov <ynorov@caviumnetworks.com>
Subject: [PATCH 07/27] [AARCH64] Use PTR_* macros in dl-trampoline.S
Date: Tue, 21 Jun 2016 08:06:51 +0300	[thread overview]
Message-ID: <1466485631-3532-9-git-send-email-ynorov@caviumnetworks.com> (raw)
In-Reply-To: <1466485631-3532-1-git-send-email-ynorov@caviumnetworks.com>

From: Andrew Pinski <apinski@cavium.com>

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.

Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
---
 sysdeps/aarch64/dl-trampoline.S | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sysdeps/aarch64/dl-trampoline.S b/sysdeps/aarch64/dl-trampoline.S
index 947a515..63ef6f7 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]
-- 
2.7.4

  parent reply	other threads:[~2016-06-21  6:46 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-21  5:06 [RFC PATCH 00/27] ARM64: support ILP32 Yury Norov
2016-06-21  5:06 ` [PATCH 01/27] [AARCH64] Fix utmp struct for compatibility reasons Yury Norov
2016-06-21 10:14   ` Szabolcs Nagy
2016-06-23  4:35     ` Yury Norov
2016-06-23  5:07       ` Andrew Pinski
2016-06-23  7:32         ` Andreas Schwab
2016-06-23  7:36           ` Yury Norov
2016-06-23  7:37             ` Andrew Pinski
2016-06-24 11:33             ` Florian Weimer
2016-06-23  7:36           ` Andrew Pinski
2016-06-23  7:56             ` Andreas Schwab
2016-06-24 11:38               ` Florian Weimer
2016-06-25 23:26                 ` Andrew Pinski
2016-06-26  6:13                   ` Yury Norov
2016-06-21 10:24   ` Joseph Myers
2016-06-21  5:06 ` [PATCH] no wrappers Yury Norov
2016-06-21  6:04   ` Yury Norov
2016-06-21  5:06 ` [PATCH 02/27] [AARCH64] Add header guards to sysdep.h headers Yury Norov
2016-06-21 10:23   ` Szabolcs Nagy
2016-06-21  5:06 ` [PATCH 03/27] Add dynamic ILP32 AARCH64 relocations to elf.h Yury Norov
2016-06-21 10:26   ` Joseph Myers
2016-06-21  5:06 ` [PATCH 04/27] [AARCH64] Add PTR_REG, PTR_LOG_SIZE, and PTR_SIZE. Use it in LDST_PCREL and LDST_GLOBAL Yury Norov
2016-06-21  7:54   ` Andreas Schwab
2016-06-21  8:36     ` Yury Norov
2016-06-21  9:13     ` Andreas Schwab
2016-06-21  5:06 ` [PATCH 05/27] [AARCH64] Use PTR_REG in crti.S Yury Norov
2016-06-21 10:28   ` Joseph Myers
2016-06-22  6:02     ` Yury Norov
2016-06-22  7:45       ` Andreas Schwab
2016-06-22 10:37       ` Joseph Myers
2016-06-21  5:06 ` [PATCH 06/27] [AARCH64] Use PTR_REG/PTR_SIZE/PTR_SIZE_LOG in dl-tlsesc.S Yury Norov
2016-06-21  8:05   ` Andreas Schwab
2016-06-21  5:06 ` Yury Norov [this message]
2016-06-21  5:06 ` [PATCH 08/27] [AARCH64] Use PTR_* in start.S Yury Norov
2016-06-21  5:06 ` [PATCH 09/27] [AARCH64] Use PTR_REG in getcontext.S Yury Norov
2016-06-21  5:06 ` [PATCH 10/27] [AARCH64] Detect ILP32 in configure scripts Yury Norov
2016-06-21  8:01   ` Andreas Schwab
2016-06-21 10:30   ` Joseph Myers
2016-06-21  5:06 ` [PATCH 11/27] [AARCH64] Syscalls for ILP32 are passed always via 64bit values Yury Norov
2016-06-21  7:56   ` Andreas Schwab
2016-06-21 11:42     ` Zhangjian (Bamvor)
2016-06-21 11:54       ` Andreas Schwab
2016-06-21 11:57       ` Zhangjian (Bamvor)
2016-06-22 15:49   ` Catalin Marinas
2016-06-23  6:32     ` Yury Norov
2016-06-21  5:06 ` [PATCH 12/27] [AARCH64] Add ILP32 support to elf_machine_load_address Yury Norov
2016-06-21  5:06 ` [PATCH 13/27] [AARCH64] Set up wordsize for ILP32 Yury Norov
2016-06-21  5:06 ` [PATCH 14/27] [AARCH64] Add ILP32 to makefiles Yury Norov
2016-06-21  5:06 ` [PATCH 15/27] [AARCH64] Add support to ldconfig for ILP32 and libilp32 Yury Norov
2016-06-21  7:59   ` Andreas Schwab
2016-06-21  5:07 ` [PATCH 16/27] [AARCH64] Add ILP32 ld.so to the known interpreter names Yury Norov
2016-06-21  5:07 ` [PATCH 17/27] [AARCH64] Add ldd-rewrite.sed so that ilp32 ld.so can be found Yury Norov
2016-06-21  5:07 ` [PATCH 18/27] [AARCH64] Add kernel_sigaction.h for AARCH64 ILP32 Yury Norov
2016-06-21  7:45   ` Andreas Schwab
2016-06-21  7:52     ` Zhangjian (Bamvor)
2016-06-21  5:07 ` [PATCH 19/27] [AARCH64] Add typesizes.h for ILP32 Yury Norov
2016-06-21  7:58   ` Andreas Schwab
2016-06-21 11:59     ` Zhangjian (Bamvor)
2016-06-23  4:54       ` Yury Norov
2016-06-21  5:07 ` [PATCH 20/27] [AARCH64] Make lp64 and ilp32 directories Yury Norov
2016-06-21  8:12   ` Andreas Schwab
2016-06-21 10:44   ` Joseph Myers
2016-06-27  7:56   ` Andreas Schwab
2016-06-27  8:03     ` Arnd Bergmann
2016-06-21  5:07 ` [PATCH 21/27] [AARCH64] ILP32: introduce syscalls that pass off_t Yury Norov
2016-06-21 10:35   ` Joseph Myers
2016-06-23  5:57     ` Yury Norov
2016-06-23 11:57       ` Joseph Myers
2016-06-21  5:07 ` [PATCH 22/27] [AARCH64] ILP32: support stat syscall family Yury Norov
2016-06-21  8:38   ` Andreas Schwab
2016-06-21 10:46   ` Joseph Myers
2016-06-27  7:51   ` Andreas Schwab
2016-06-21  5:07 ` [PATCH 23/27] [AARCH64] delouse input arguments in system functions Yury Norov
2016-06-21  8:08   ` Andreas Schwab
2016-06-21 10:36   ` Joseph Myers
2016-06-21 15:42     ` Arnd Bergmann
2016-06-21 16:37       ` Andrew Pinski
2016-06-21  5:07 ` [PATCH 24/27] Add support for AT_ARM64_MIDR Yury Norov
2016-06-21  8:09   ` Andreas Schwab
2016-06-21  5:07 ` [PATCH 25/27] [AARCH64] Fix ILP32 warning Yury Norov
2016-06-21 10:44   ` Joseph Myers
2016-06-21  5:07 ` [PATCH 26/27] [AARCH64] Change type of __align to long long Yury Norov
2016-06-21  8:10   ` Andreas Schwab
2016-06-21 10:57   ` Zhangjian (Bamvor)
2016-07-06 10:36     ` Andreas Schwab
2016-06-21  5:07 ` [PATCH 27/27] Fix PTRDIFF_MIN/PTRDIFF_MIN and PTRDIFF_MIN for ILP32 Yury Norov
2016-06-21 10:32   ` Joseph Myers
2016-06-21 10:23 ` [RFC PATCH 00/27] ARM64: support ILP32 Joseph Myers
2016-06-21 12:06 ` Zhangjian (Bamvor)
2016-06-22  2:04   ` Yury Norov
2016-06-28 15:26   ` Yury Norov
2016-06-21 15:10 ` Szabolcs Nagy

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=1466485631-3532-9-git-send-email-ynorov@caviumnetworks.com \
    --to=ynorov@caviumnetworks.com \
    --cc=apinski@cavium.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=davem@davemloft.net \
    --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=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 NNTP newsgroup(s).