The original source of the patch is located here
Created
October 10, 2023 22:27
-
-
Save OrigamiEngineer/9e99c669cc90420dcaba6f4efec11751 to your computer and use it in GitHub Desktop.
FFMPEG patch modified for gimp-gap 2.7-1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From: Rémi Denis-Courmont <remi@remlab.net> | |
Date: Sun, 16 Jul 2023 15:18:02 +0000 (+0300) | |
Subject: avcodec/x86/mathops: clip constants used with shift instructions within inline assembly | |
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/effadce6c756247ea8bae32dc13bb3e6f464f0eb | |
avcodec/x86/mathops: clip constants used with shift instructions within inline assembly | |
Fixes assembling with binutil as >= 2.41 | |
Signed-off-by: James Almer <jamrial@gmail.com> | |
--- | |
diff --git a/extern_libs/ffmpeg/libavcodec/x86/mathops.h b/extern_libs/ffmpeg/libavcodec/x86/mathops.h | |
index 6298f5ed19..ca7e2dffc1 100644 | |
--- a/extern_libs/ffmpeg/libavcodec/x86/mathops.h | |
+++ b/extern_libs/ffmpeg/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; | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment