| Message ID | 1508013333-19485-2-git-send-email-martin@martin.st |
|---|---|
| State | Committed |
| Headers | show |
On Sat, Oct 14, 2017 at 11:35:32PM +0300, Martin Storsjö wrote: > This fixes building with armasm64 (when run through gas-preprocessor). > --- > libavcodec/aarch64/mpegaudiodsp_neon.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) OK Diego
On 2017-10-14 23:35:32 +0300, Martin Storsjö wrote: > This fixes building with armasm64 (when run through gas-preprocessor). > --- > libavcodec/aarch64/mpegaudiodsp_neon.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/aarch64/mpegaudiodsp_neon.S b/libavcodec/aarch64/mpegaudiodsp_neon.S > index 34181d9..6dbf142 100644 > --- a/libavcodec/aarch64/mpegaudiodsp_neon.S > +++ b/libavcodec/aarch64/mpegaudiodsp_neon.S > @@ -24,7 +24,7 @@ > #define WFRAC_BITS 16 // fractional bits for window > #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) > > -const tbl_rev128.s, align=4 > +const tbl_rev128, align=4 > .byte 12, 13, 14, 15 > .byte 8, 9, 10, 11 > .byte 4, 5, 6, 7 > @@ -39,7 +39,7 @@ function ff_mpadsp_apply_window_\type\()_neon, export=1 > ld1 {v4.4s,v5.4s,v6.4s,v7.4s}, [x7], #64 > st1 {v0.4s,v1.4s,v2.4s,v3.4s}, [x8], #64 > st1 {v4.4s,v5.4s,v6.4s,v7.4s}, [x8], #64 > - movrel x15, tbl_rev128.s > + movrel x15, tbl_rev128 > ld1 {v27.4s}, [x15] > .ifc \type, fixed > lsl x4, x4, #1 please keep the 's' or replace it with another indicator for the element size. tbl_rev128_s or tbl_rev128_32 would be ok for me. Janne
On Wed, 18 Oct 2017, Janne Grunau wrote: > On 2017-10-14 23:35:32 +0300, Martin Storsjö wrote: >> This fixes building with armasm64 (when run through gas-preprocessor). >> --- >> libavcodec/aarch64/mpegaudiodsp_neon.S | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/libavcodec/aarch64/mpegaudiodsp_neon.S b/libavcodec/aarch64/mpegaudiodsp_neon.S >> index 34181d9..6dbf142 100644 >> --- a/libavcodec/aarch64/mpegaudiodsp_neon.S >> +++ b/libavcodec/aarch64/mpegaudiodsp_neon.S >> @@ -24,7 +24,7 @@ >> #define WFRAC_BITS 16 // fractional bits for window >> #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) >> >> -const tbl_rev128.s, align=4 >> +const tbl_rev128, align=4 >> .byte 12, 13, 14, 15 >> .byte 8, 9, 10, 11 >> .byte 4, 5, 6, 7 >> @@ -39,7 +39,7 @@ function ff_mpadsp_apply_window_\type\()_neon, export=1 >> ld1 {v4.4s,v5.4s,v6.4s,v7.4s}, [x7], #64 >> st1 {v0.4s,v1.4s,v2.4s,v3.4s}, [x8], #64 >> st1 {v4.4s,v5.4s,v6.4s,v7.4s}, [x8], #64 >> - movrel x15, tbl_rev128.s >> + movrel x15, tbl_rev128 >> ld1 {v27.4s}, [x15] >> .ifc \type, fixed >> lsl x4, x4, #1 > > please keep the 's' or replace it with another indicator for the element > size. tbl_rev128_s or tbl_rev128_32 would be ok for me. Ok, will make it tbl_rev128_s. // Martin
diff --git a/libavcodec/aarch64/mpegaudiodsp_neon.S b/libavcodec/aarch64/mpegaudiodsp_neon.S index 34181d9..6dbf142 100644 --- a/libavcodec/aarch64/mpegaudiodsp_neon.S +++ b/libavcodec/aarch64/mpegaudiodsp_neon.S @@ -24,7 +24,7 @@ #define WFRAC_BITS 16 // fractional bits for window #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) -const tbl_rev128.s, align=4 +const tbl_rev128, align=4 .byte 12, 13, 14, 15 .byte 8, 9, 10, 11 .byte 4, 5, 6, 7 @@ -39,7 +39,7 @@ function ff_mpadsp_apply_window_\type\()_neon, export=1 ld1 {v4.4s,v5.4s,v6.4s,v7.4s}, [x7], #64 st1 {v0.4s,v1.4s,v2.4s,v3.4s}, [x8], #64 st1 {v4.4s,v5.4s,v6.4s,v7.4s}, [x8], #64 - movrel x15, tbl_rev128.s + movrel x15, tbl_rev128 ld1 {v27.4s}, [x15] .ifc \type, fixed lsl x4, x4, #1