mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-27 02:45:34 +02:00
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
|
|
From: Rémi Denis-Courmont <remi@remlab.net>
|
|
Date: Sun, 16 Jul 2023 18:18:02 +0300
|
|
Subject: [PATCH] Fix ffmpeg assembly with newer binutil
|
|
|
|
avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
|
|
|
|
Fixes assembling with binutil as >= 2.41
|
|
|
|
FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
|
|
|
|
Deals with: "Error: operand type mismatch for `shr'"
|
|
|
|
Fixes: QTBUG-116649
|
|
Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
|
|
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
|
|
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
|
|
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
|
|
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
---
|
|
|
|
diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
|
|
index 6298f5e..ca7e2df 100644
|
|
--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
|
|
+++ b/qtwebengine/src/3rdparty/chromium/third_party/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 @@
|
|
// 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;
|
|
}
|