diff options
Diffstat (limited to 'graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm')
| -rw-r--r-- | graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm | 128 |
1 files changed, 0 insertions, 128 deletions
diff --git a/graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm b/graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm deleted file mode 100644 index c1d16cd..0000000 --- a/graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm +++ /dev/null | |||
| @@ -1,128 +0,0 @@ | |||
| 1 | - place a table in rodata | ||
| 2 | - use _CET_ENDBR in functions header | ||
| 3 | |||
| 4 | Index: libavcodec/x86/fft.asm | ||
| 5 | --- libavcodec/x86/fft.asm.orig | ||
| 6 | +++ libavcodec/x86/fft.asm | ||
| 7 | @@ -325,6 +325,7 @@ INIT_YMM avx | ||
| 8 | %if HAVE_AVX_EXTERNAL | ||
| 9 | align 16 | ||
| 10 | fft8_avx: | ||
| 11 | + _CET_ENDBR | ||
| 12 | mova m0, Z(0) | ||
| 13 | mova m1, Z(1) | ||
| 14 | T8_AVX m0, m1, m2, m3, m4 | ||
| 15 | @@ -335,6 +336,7 @@ fft8_avx: | ||
| 16 | |||
| 17 | align 16 | ||
| 18 | fft16_avx: | ||
| 19 | + _CET_ENDBR | ||
| 20 | mova m2, Z(2) | ||
| 21 | mova m3, Z(3) | ||
| 22 | T4_SSE m2, m3, m7 | ||
| 23 | @@ -372,6 +374,7 @@ fft16_avx: | ||
| 24 | |||
| 25 | align 16 | ||
| 26 | fft32_avx: | ||
| 27 | + _CET_ENDBR | ||
| 28 | call fft16_avx | ||
| 29 | |||
| 30 | mova m0, Z(4) | ||
| 31 | @@ -396,6 +399,7 @@ fft32_avx: | ||
| 32 | ret | ||
| 33 | |||
| 34 | fft32_interleave_avx: | ||
| 35 | + _CET_ENDBR | ||
| 36 | call fft32_avx | ||
| 37 | mov r2d, 32 | ||
| 38 | .deint_loop: | ||
| 39 | @@ -419,6 +423,7 @@ INIT_XMM sse | ||
| 40 | align 16 | ||
| 41 | fft4_avx: | ||
| 42 | fft4_sse: | ||
| 43 | + _CET_ENDBR | ||
| 44 | mova m0, Z(0) | ||
| 45 | mova m1, Z(1) | ||
| 46 | T4_SSE m0, m1, m2 | ||
| 47 | @@ -428,6 +433,7 @@ fft4_sse: | ||
| 48 | |||
| 49 | align 16 | ||
| 50 | fft8_sse: | ||
| 51 | + _CET_ENDBR | ||
| 52 | mova m0, Z(0) | ||
| 53 | mova m1, Z(1) | ||
| 54 | T4_SSE m0, m1, m2 | ||
| 55 | @@ -442,6 +448,7 @@ fft8_sse: | ||
| 56 | |||
| 57 | align 16 | ||
| 58 | fft16_sse: | ||
| 59 | + _CET_ENDBR | ||
| 60 | mova m0, Z(0) | ||
| 61 | mova m1, Z(1) | ||
| 62 | T4_SSE m0, m1, m2 | ||
| 63 | @@ -465,6 +472,7 @@ fft16_sse: | ||
| 64 | %macro FFT48_3DNOW 0 | ||
| 65 | align 16 | ||
| 66 | fft4 %+ SUFFIX: | ||
| 67 | + _CET_ENDBR | ||
| 68 | T2_3DNOW m0, m1, Z(0), Z(1) | ||
| 69 | mova m2, Z(2) | ||
| 70 | mova m3, Z(3) | ||
| 71 | @@ -479,6 +487,7 @@ fft4 %+ SUFFIX: | ||
| 72 | |||
| 73 | align 16 | ||
| 74 | fft8 %+ SUFFIX: | ||
| 75 | + _CET_ENDBR | ||
| 76 | T2_3DNOW m0, m1, Z(0), Z(1) | ||
| 77 | mova m2, Z(2) | ||
| 78 | mova m3, Z(3) | ||
| 79 | @@ -532,6 +541,7 @@ FFT48_3DNOW | ||
| 80 | %macro DECL_PASS 2+ ; name, payload | ||
| 81 | align 16 | ||
| 82 | %1: | ||
| 83 | + _CET_ENDBR | ||
| 84 | DEFINE_ARGS zc, w, n, o1, o3 | ||
| 85 | lea o3q, [nq*3] | ||
| 86 | lea o1q, [nq*8] | ||
| 87 | @@ -548,10 +558,6 @@ DEFINE_ARGS zc, w, n, o1, o3 | ||
| 88 | %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs | ||
| 89 | lea r2, [dispatch_tab%1] | ||
| 90 | mov r2, [r2 + (%2q-2)*gprsize] | ||
| 91 | -%ifdef PIC | ||
| 92 | - lea r3, [$$] | ||
| 93 | - add r2, r3 | ||
| 94 | -%endif | ||
| 95 | call r2 | ||
| 96 | %endmacro ; FFT_DISPATCH | ||
| 97 | |||
| 98 | @@ -731,11 +737,7 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0 | ||
| 99 | %define pass_interleave_3dnowext pass_interleave_3dnow | ||
| 100 | %endif | ||
| 101 | |||
| 102 | -%ifdef PIC | ||
| 103 | -%define SECTION_REL - $$ | ||
| 104 | -%else | ||
| 105 | %define SECTION_REL | ||
| 106 | -%endif | ||
| 107 | |||
| 108 | %macro DECL_FFT 1-2 ; nbits, suffix | ||
| 109 | %ifidn %0, 1 | ||
| 110 | @@ -759,6 +761,7 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0 | ||
| 111 | |||
| 112 | align 16 | ||
| 113 | fft %+ n %+ fullsuffix: | ||
| 114 | + _CET_ENDBR | ||
| 115 | call fft %+ n2 %+ SUFFIX | ||
| 116 | add r0, n*4 - (n&(-2<<%1)) | ||
| 117 | call fft %+ n4 %+ SUFFIX | ||
| 118 | @@ -773,8 +776,10 @@ fft %+ n %+ fullsuffix: | ||
| 119 | %endrep | ||
| 120 | %undef n | ||
| 121 | |||
| 122 | +[SECTION .data.rel.ro write] | ||
| 123 | align 8 | ||
| 124 | dispatch_tab %+ fullsuffix: pointer list_of_fft | ||
| 125 | +__?SECT?__ | ||
| 126 | %endmacro ; DECL_FFT | ||
| 127 | |||
| 128 | %if HAVE_AVX_EXTERNAL | ||
