From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752170AbcFUIqW (ORCPT <rfc822;w@1wt.eu>);
	Tue, 21 Jun 2016 04:46:22 -0400
Received: from mx2.suse.de ([195.135.220.15]:54496 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751369AbcFUIqS (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 21 Jun 2016 04:46:18 -0400
From: Andreas Schwab <schwab@suse.de>
To: Yury Norov <ynorov@caviumnetworks.com>
Cc: <libc-alpha@sourceware.org>, <linux-kernel@vger.kernel.org>,
        <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>
Subject: Re: [PATCH 04/27] [AARCH64] Add PTR_REG, PTR_LOG_SIZE, and PTR_SIZE.  Use it in LDST_PCREL and LDST_GLOBAL.
References: <1466485631-3532-1-git-send-email-ynorov@caviumnetworks.com>
	<1466485631-3532-6-git-send-email-ynorov@caviumnetworks.com>
X-Yow: ..  I don't know why but, suddenly, I want to discuss declining I.Q.
 LEVELS with a blue ribbon SENATE SUB-COMMITTEE!
Date: Tue, 21 Jun 2016 09:54:47 +0200
In-Reply-To: <1466485631-3532-6-git-send-email-ynorov@caviumnetworks.com>
	(Yury Norov's message of "Tue, 21 Jun 2016 08:06:48 +0300")
Message-ID: <mvmporbrn7c.fsf@hawking.suse.de>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Yury Norov <ynorov@caviumnetworks.com> writes:

> diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
> index 4cb028f..f2ea821 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	x##R, [x##T];

I think this needs to be PTR_REG(x).

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."