[FFmpeg-devel] [PATCH] lavc/aarch64/simple_idct: separate macro arguments with commas

[Matthieu Bouron]

On Sun, May 7, 2017 at 11:05 AM, Matthieu Bouron <matthieu.bouron at gmail.com>
wrote:

>
>
> Le 2 mai 2017 12:01 PM, "Benoit Fouet" <benoit.fouet at free.fr> a écrit :
>
> Hi,
>
>
> On 28/04/2017 21:58, Matthieu Bouron wrote:
> > Untested: fixes ticket #6324.
> > ---
> >  libavcodec/aarch64/simple_idct_neon.S | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/libavcodec/aarch64/simple_idct_neon.S
> b/libavcodec/aarch64/simple_idct_neon.S
> > index 52273420f9..d31f72a609 100644
> > --- a/libavcodec/aarch64/simple_idct_neon.S
> > +++ b/libavcodec/aarch64/simple_idct_neon.S
> > @@ -61,19 +61,19 @@ endconst
> >          br              x10
> >  .endm
> >
> > -.macro smull1 a b c
> > +.macro smull1 a, b, c
> >          smull           \a, \b, \c
> >  .endm
> >
> > -.macro smlal1 a b c
> > +.macro smlal1 a, b, c
> >          smlal           \a, \b, \c
> >  .endm
> >
> > -.macro smlsl1 a b c
> > +.macro smlsl1 a, b, c
> >          smlsl           \a, \b, \c
> >  .endm
> >
> > -.macro idct_col4_top y1 y2 y3 y4 i l
> > +.macro idct_col4_top y1, y2, y3, y4, i, l
> >          smull\i         v7.4S,  \y3\().\l, z2
> >          smull\i         v16.4S, \y3\().\l, z6
> >          smull\i         v17.4S, \y2\().\l, z1
> > @@ -91,7 +91,7 @@ endconst
> >          smlsl\i         v6.4S,  \y4\().\l, z5
> >  .endm
> >
> > -.macro idct_row4_neon y1 y2 y3 y4 pass
> > +.macro idct_row4_neon y1, y2, y3, y4, pass
> >          ld1             {\y1\().2D-\y2\().2D}, [x2], #32
> >          movi            v23.4S, #1<<2, lsl #8
> >          orr             v5.16B, \y1\().16B, \y2\().16B
> > @@ -153,7 +153,7 @@ endconst
> >          trn2            \y4\().4S, v17.4S, v19.4S
> >  .endm
> >
> > -.macro declare_idct_col4_neon i l
> > +.macro declare_idct_col4_neon i, l
> >  function idct_col4_neon\i
> >          dup             v23.4H, z4c
> >  .if \i == 1
>
> Sounds sane, but shouldn't we be doing this for all instances of
> multiple arguments macros without commas?
>
>
> Sure, I may have missed some. I will work again on this patch on Tuesday
> as I will have access to an apple machine (and hopefully fix the build
> without gas-preprocessor).
>
> Sorry for the delay,
> Matthieu
>
>
Updated patch attached:
  * add missing commas to separate macro arguments
  * passes .4H/.8H as macro arguments instead of .4H/.8H (the later form
being interpreted as an hexadecimal value, ie: 4/8).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lavc-aarch64-simple_idct-fix-iOS-build-without-gas-p.patch
Type: text/x-patch
Size: 6516 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170509/a0025a6a/attachment.bin>