From: Stefan Agner <stefan@agner.ch>
To: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: mark.rutland@arm.com, arnd@arndb.de, ard.biesheuvel@linaro.org,
will.deacon@arm.com, julien.thierry@arm.com,
ndesaulniers@google.com, linux@armlinux.org.uk,
linux-kernel@vger.kernel.org, thierry.reding@gmail.com,
natechancellor@gmail.com, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 2/5] ARM: use unified assembler in headers
Date: Sat, 09 Feb 2019 23:54:12 +0100 [thread overview]
Message-ID: <b79145b3420212e0ff04dfa0da200790@agner.ch> (raw)
In-Reply-To: <nycvar.YSQ.7.76.1902071055380.2213@knanqh.ubzr>
On 07.02.2019 17:10, Nicolas Pitre wrote:
> On Thu, 7 Feb 2019, Stefan Agner wrote:
>
>> Use unified assembler syntax (UAL) in headers. Divided syntax is
>> considered depricated. This will also allow to build the kernel
>> using LLVM's integrated assembler.
>>
>> Signed-off-by: Stefan Agner <stefan@agner.ch>
>> ---
>> arch/arm/include/asm/assembler.h | 8 ++++----
>> arch/arm/include/asm/vfpmacros.h | 8 ++++----
>> arch/arm/lib/bitops.h | 8 ++++----
>> 3 files changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
>> index 28a48e0d4cca..60465b55683c 100644
>> --- a/arch/arm/include/asm/assembler.h
>> +++ b/arch/arm/include/asm/assembler.h
>> @@ -376,7 +376,7 @@ THUMB( orr \reg , \reg , #PSR_T_BIT )
>> .macro usraccoff, instr, reg, ptr, inc, off, cond, abort, t=TUSER()
>> 9999:
>> .if \inc == 1
>> - \instr\cond\()b\()\t\().w \reg, [\ptr, #\off]
>> + \instr\()b\cond\()\t\().w \reg, [\ptr, #\off]
>
> Similar comment here: you added a \() between \instr and b as needed,
> but the one between \cond and \t (which was already redundant before)
> may go.
Thanks, Nicolas, fixed this.
Also noticed that the else branch has such a null token in excess.
Furthermore, the "t" token actually needs to be before the condition
token too. It should look something like this in the end:
.if \inc == 1
\instr\()b\t\cond\().w \reg, [\ptr, #\off]
.elseif \inc == 4
\instr\t\cond\().w \reg, [\ptr, #\off]
.else
...
--
Stefan
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-09 22:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 9:48 [PATCH 0/5] ARM: convert to unified syntax Stefan Agner
2019-02-07 9:48 ` [PATCH 1/5] ARM: use unified assembler in macros Stefan Agner
2019-02-07 13:34 ` Ard Biesheuvel
2019-02-07 15:52 ` Nicolas Pitre
2019-02-07 9:48 ` [PATCH 2/5] ARM: use unified assembler in headers Stefan Agner
2019-02-07 16:10 ` Nicolas Pitre
2019-02-09 22:54 ` Stefan Agner [this message]
2019-02-07 9:48 ` [PATCH 3/5] ARM: use unified assembler in assembly files Stefan Agner
2019-02-07 9:48 ` [PATCH 4/5] ARM: use unified assembler in c files Stefan Agner
2019-02-09 17:28 ` Stefan Agner
2019-02-11 18:17 ` Nick Desaulniers
2019-02-12 19:26 ` Stefan Agner
2019-02-07 9:48 ` [PATCH 5/5] ARM: warn if divided syntax assembler is used Stefan Agner
2019-02-07 20:52 ` Nick Desaulniers
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=b79145b3420212e0ff04dfa0da200790@agner.ch \
--to=stefan@agner.ch \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=julien.thierry@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=natechancellor@gmail.com \
--cc=ndesaulniers@google.com \
--cc=nicolas.pitre@linaro.org \
--cc=thierry.reding@gmail.com \
--cc=will.deacon@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).