[FFmpeg-devel] [PATCH 1/5] x86 inline assembly compliance

[FRÉDÉRIC RECOULES]

For whatever reason, something gobbles the space just before '#include "constants.h"'... 

Once again, the patches have been resubmitted (from my orange.fr address using 'git send-email', I had a hard time with the professional SMTP server).
Hope everything goes right this time, sorry for this inconvenience. 

Regards,
Frédéric Recoules

----- Mail original -----
De: "michael" <michael at niedermayer.cc>
À: "ffmpeg-devel" <ffmpeg-devel at ffmpeg.org>
Cc: "Richard Bonichon" <richard.bonichon at gmail.com>, "Sébastien Bardin" <sebastien.bardin at cea.fr>
Envoyé: Mercredi 22 Avril 2020 18:03:12
Objet: Re: [FFmpeg-devel] [PATCH 1/5] x86 inline assembly compliance

On Sat, Apr 04, 2020 at 12:32:13PM +0200, FRÉDÉRIC RECOULES wrote: 
> [inline assembly] prepares for contiguous assembly statements merging 
> 
> --- 
> libavcodec/x86/inline_asm.h | 29 +++++++++++++++++------------ 
> 1 file changed, 17 insertions(+), 12 deletions(-) 
> 
> diff --git a/libavcodec/x86/inline_asm.h b/libavcodec/x86/inline_asm.h 
> index 0198746719..6ead73ac33 100644 
> --- a/libavcodec/x86/inline_asm.h 
> +++ b/libavcodec/x86/inline_asm.h 
> @@ -23,13 +23,15 @@ 
> 
> #include "constants.h" 
> 
> -#define MOVQ_WONE(regd) \ 
> - __asm__ volatile ( \ 
> - "pcmpeqd %%" #regd ", %%" #regd " \n\t" \ 
> - "psrlw $15, %%" #regd ::) 
> +#define MOVQ_WONE_TPL(regd) \ 
> + "pcmpeqd %%"#regd", %%"#regd" \n\t" \ 
> + "psrlw $15, %%" #regd" \n\t" 
> +#define MOVQ_WONE(regd) __asm__ volatile (MOVQ_WONE_TPL(regd) ::) 
> 
> #define JUMPALIGN() __asm__ volatile (".p2align 3"::) 
> -#define MOVQ_ZERO(regd) __asm__ volatile ("pxor %%"#regd", %%"#regd ::) 
> + 
> +#define MOVQ_ZERO_TPL(regd) "pxor %%"#regd", %%"#regd" \n\t" 
> +#define MOVQ_ZERO(regd) __asm__ volatile (MOVQ_ZERO_TPL(regd) ::) 

this is not a valid patch and cannot be applied 

Applying: x86 inline assembly compliance 
error: corrupt patch at line 11 
error: could not build fake ancestor 
Patch failed at 0001 x86 inline assembly compliance 
Use 'git am --show-current-patch' to see the failed patch 
When you have resolved this problem, run "git am --continue". 
If you prefer to skip this patch, run "git am --skip" instead. 
To restore the original branch and stop patching, run "git am --abort". 



[...] 
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB 

Those who would give up essential Liberty, to purchase a little 
temporary Safety, deserve neither Liberty nor Safety -- Benjamin Franklin 

_______________________________________________ 
ffmpeg-devel mailing list 
ffmpeg-devel at ffmpeg.org 
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel 

To unsubscribe, visit link above, or email 
ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".