|
@@ -0,0 +1,84 @@
|
|
|
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
|
|
|
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
|
|
+Date: Sun, 16 Jul 2023 18:18:02 +0300
|
|
|
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
|
|
|
+ instructions within inline assembly
|
|
|
+
|
|
|
+Fixes assembling with binutils as >= 2.41
|
|
|
+
|
|
|
+Upstream: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb
|
|
|
+
|
|
|
+Bug reports for this change in binutils:
|
|
|
+https://fftrac-bg.ffmpeg.org/ticket/10405
|
|
|
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108941
|
|
|
+https://sourceware.org/bugzilla/show_bug.cgi?id=30578
|
|
|
+
|
|
|
+Signed-off-by: James Almer <jamrial@gmail.com>
|
|
|
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
|
+---
|
|
|
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
|
|
|
+ 1 file changed, 23 insertions(+), 3 deletions(-)
|
|
|
+
|
|
|
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
|
|
|
+index 6298f5ed19..ca7e2dffc1 100644
|
|
|
+--- a/libavcodec/x86/mathops.h
|
|
|
++++ b/libavcodec/x86/mathops.h
|
|
|
+@@ -35,12 +35,20 @@
|
|
|
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
|
|
+ {
|
|
|
+ int rt, dummy;
|
|
|
++ if (__builtin_constant_p(shift))
|
|
|
+ __asm__ (
|
|
|
+ "imull %3 \n\t"
|
|
|
+ "shrdl %4, %%edx, %%eax \n\t"
|
|
|
+ :"=a"(rt), "=d"(dummy)
|
|
|
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
|
|
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
|
|
+ );
|
|
|
++ else
|
|
|
++ __asm__ (
|
|
|
++ "imull %3 \n\t"
|
|
|
++ "shrdl %4, %%edx, %%eax \n\t"
|
|
|
++ :"=a"(rt), "=d"(dummy)
|
|
|
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
|
|
++ );
|
|
|
+ return rt;
|
|
|
+ }
|
|
|
+
|
|
|
+@@ -113,19 +121,31 @@ __asm__ volatile(\
|
|
|
+ // avoid +32 for shift optimization (gcc should do that ...)
|
|
|
+ #define NEG_SSR32 NEG_SSR32
|
|
|
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
|
|
++ if (__builtin_constant_p(s))
|
|
|
+ __asm__ ("sarl %1, %0\n\t"
|
|
|
+ : "+r" (a)
|
|
|
+- : "ic" ((uint8_t)(-s))
|
|
|
++ : "i" (-s & 0x1F)
|
|
|
+ );
|
|
|
++ else
|
|
|
++ __asm__ ("sarl %1, %0\n\t"
|
|
|
++ : "+r" (a)
|
|
|
++ : "c" ((uint8_t)(-s))
|
|
|
++ );
|
|
|
+ return a;
|
|
|
+ }
|
|
|
+
|
|
|
+ #define NEG_USR32 NEG_USR32
|
|
|
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
|
|
++ if (__builtin_constant_p(s))
|
|
|
+ __asm__ ("shrl %1, %0\n\t"
|
|
|
+ : "+r" (a)
|
|
|
+- : "ic" ((uint8_t)(-s))
|
|
|
++ : "i" (-s & 0x1F)
|
|
|
+ );
|
|
|
++ else
|
|
|
++ __asm__ ("shrl %1, %0\n\t"
|
|
|
++ : "+r" (a)
|
|
|
++ : "c" ((uint8_t)(-s))
|
|
|
++ );
|
|
|
+ return a;
|
|
|
+ }
|
|
|
+
|
|
|
+--
|
|
|
+2.30.2
|
|
|
+
|