Make things up-to-date with upstream. https://code.videolan.org/videolan/x86inc.asm
Showing the changes to libavcodec (10 of 12 files). Show all
Unified · Split
| @@ -74,7 +74,7 @@ SECTION .text · 73 unmodified lines | ||
| 74 | 74 | ; "movaps m0, [r5 + r4]" if PIC is enabled |
| 75 | 75 | ; "movaps m0, [constant_name + r4]" if texrel are used |
| 76 | 76 | %macro SET_PIC_BASE 3; reg, const_label |
| 77 | −%ifdef PIC | |
| 77 | +%if PIC | |
| 78 | 78 | %{1} %2, [%3] ; lea r5, [rip+const] |
| 79 | 79 | %define pic_base_%3 %2 |
| 80 | 80 | %else |
| @@ -195,7 +195,7 @@ align 16 · 114 unmodified lines | ||
| 195 | 195 | ; PIC relative addressing. Use this |
| 196 | 196 | ; to count it in cglobal |
| 197 | 197 | ; |
| 198 | −%ifdef PIC | |
| 198 | +%if PIC | |
| 199 | 199 | %define num_pic_regs 1 |
| 200 | 200 | %else |
| 201 | 201 | %define num_pic_regs 0 |
| @@ -91,7 +91,7 @@ SECTION .text · 90 unmodified lines | ||
| 91 | 91 | |
| 92 | 92 | %macro chroma_mc8_mmx_func 2-3 |
| 93 | 93 | %ifidn %2, rv40 |
| 94 | −%ifdef PIC | |
| 94 | +%if PIC | |
| 95 | 95 | %define rnd_1d_rv40 r8 |
| 96 | 96 | %define rnd_2d_rv40 r8 |
| 97 | 97 | %define extra_regs 2 |
| @@ -147,7 +147,7 @@ cglobal %1_%2_chroma_mc8%3, 6, 7 + extra_regs, 0 · 49 unmodified lines | ||
| 147 | 147 | or r4d, r5d ; x + y |
| 148 | 148 | |
| 149 | 149 | %ifidn %2, rv40 |
| 150 | −%ifdef PIC | |
| 150 | +%if PIC | |
| 151 | 151 | lea r8, [rnd_rv40_1d_tbl] |
| 152 | 152 | %endif |
| 153 | 153 | %if ARCH_X86_64 == 0 |
| @@ -198,7 +198,7 @@ cglobal %1_%2_chroma_mc8%3, 6, 7 + extra_regs, 0 · 44 unmodified lines | ||
| 198 | 198 | movd m4, r4d ; x |
| 199 | 199 | movd m6, r5d ; y |
| 200 | 200 | %ifidn %2, rv40 |
| 201 | −%ifdef PIC | |
| 201 | +%if PIC | |
| 202 | 202 | lea r8, [rnd_rv40_2d_tbl] |
| 203 | 203 | %endif |
| 204 | 204 | %if ARCH_X86_64 == 0 |
| @@ -283,7 +283,7 @@ cglobal %1_%2_chroma_mc8%3, 6, 7 + extra_regs, 0 · 78 unmodified lines | ||
| 283 | 283 | %macro chroma_mc4_mmx_func 2 |
| 284 | 284 | %define extra_regs 0 |
| 285 | 285 | %ifidn %2, rv40 |
| 286 | −%ifdef PIC | |
| 286 | +%if PIC | |
| 287 | 287 | %define extra_regs 1 |
| 288 | 288 | %endif ; PIC |
| 289 | 289 | %endif ; rv40 |
| @@ -301,7 +301,7 @@ cglobal %1_%2_chroma_mc4, 6, 6 + extra_regs, 0 · 11 unmodified lines | ||
| 301 | 301 | psubw m5, m3 |
| 302 | 302 | |
| 303 | 303 | %ifidn %2, rv40 |
| 304 | −%ifdef PIC | |
| 304 | +%if PIC | |
| 305 | 305 | lea r6, [rnd_rv40_2d_tbl] |
| 306 | 306 | %define rnd_2d_rv40 r6 |
| 307 | 307 | %else |
| @@ -42,7 +42,7 @@ scan8_mem: db 4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8 · 41 unmodified lines | ||
| 42 | 42 | db 6+11*8, 7+11*8, 6+12*8, 7+12*8 |
| 43 | 43 | db 4+13*8, 5+13*8, 4+14*8, 5+14*8 |
| 44 | 44 | db 6+13*8, 7+13*8, 6+14*8, 7+14*8 |
| 45 | −%ifdef PIC | |
| 45 | +%if PIC | |
| 46 | 46 | %define npicregs 1 |
| 47 | 47 | %define scan8 picregq |
| 48 | 48 | %else |
| @@ -322,7 +322,7 @@ INIT_XMM sse2 · 273 unmodified lines | ||
| 322 | 322 | cglobal h264_idct8_add4_8, 5, 8 + npicregs, 10, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg |
| 323 | 323 | movsxdifnidn r3, r3d |
| 324 | 324 | xor r5, r5 |
| 325 | −%ifdef PIC | |
| 325 | +%if PIC | |
| 326 | 326 | lea picregq, [scan8_mem] |
| 327 | 327 | %endif |
| 328 | 328 | .nextblock: |
| @@ -398,7 +398,7 @@ h264_idct_add8_mmx_plane: · 69 unmodified lines | ||
| 398 | 398 | cglobal h264_idct_add8_422_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg |
| 399 | 399 | ; dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg |
| 400 | 400 | movsxdifnidn r3, r3d |
| 401 | −%ifdef PIC | |
| 401 | +%if PIC | |
| 402 | 402 | lea picregq, [scan8_mem] |
| 403 | 403 | %endif |
| 404 | 404 | %if ARCH_X86_64 |
| @@ -1311,10 +1311,7 @@ PRED8x8L_DOWN_RIGHT · 1310 unmodified lines | ||
| 1311 | 1311 | ;----------------------------------------------------------------------------- |
| 1312 | 1312 | |
| 1313 | 1313 | %macro PRED8x8L_VERTICAL_RIGHT 0 |
| 1314 | −cglobal pred8x8l_vertical_right_8, 4,5,7 | |
| 1315 | − ; manually spill XMM registers for Win64 because | |
| 1316 | − ; the code here is initialized with INIT_MMX | |
| 1317 | − WIN64_SPILL_XMM 7 | |
| 1314 | +cglobal pred8x8l_vertical_right_8, 4,5,6 | |
| 1318 | 1315 | sub r0, r3 |
| 1319 | 1316 | lea r4, [r0+r3*2] |
| 1320 | 1317 | movq mm0, [r0+r3*1-8] |
| @@ -1384,7 +1381,6 @@ cglobal pred8x8l_vertical_right_8, 4,5,7 · 63 unmodified lines | ||
| 1384 | 1381 | movq2dq xmm4, mm6 |
| 1385 | 1382 | pslldq xmm4, 8 |
| 1386 | 1383 | por xmm0, xmm4 |
| 1387 | − movdqa xmm6, [pw_ff00] | |
| 1388 | 1384 | movdqa xmm1, xmm0 |
| 1389 | 1385 | lea r2, [r1+r3*2] |
| 1390 | 1386 | movdqa xmm2, xmm0 |
| @@ -1394,15 +1390,16 @@ cglobal pred8x8l_vertical_right_8, 4,5,7 · 3 unmodified lines | ||
| 1394 | 1390 | pavgb xmm2, xmm0 |
| 1395 | 1391 | INIT_XMM cpuname |
| 1396 | 1392 | PRED4x4_LOWPASS xmm4, xmm3, xmm1, xmm0, xmm5 |
| 1397 | − pandn xmm6, xmm4 | |
| 1393 | + movdqa xmm0, [pw_ff00] | |
| 1394 | + pandn xmm0, xmm4 | |
| 1398 | 1395 | movdqa xmm5, xmm4 |
| 1399 | 1396 | psrlw xmm4, 8 |
| 1400 | − packuswb xmm6, xmm4 | |
| 1401 | − movhlps xmm4, xmm6 | |
| 1397 | + packuswb xmm0, xmm4 | |
| 1398 | + movhlps xmm4, xmm0 | |
| 1402 | 1399 | movhps [r0+r3*2], xmm5 |
| 1403 | 1400 | movhps [r0+r3*1], xmm2 |
| 1404 | 1401 | psrldq xmm5, 4 |
| 1405 | − movss xmm5, xmm6 | |
| 1402 | + movss xmm5, xmm0 | |
| 1406 | 1403 | psrldq xmm2, 4 |
| 1407 | 1404 | movss xmm2, xmm4 |
| 1408 | 1405 | lea r0, [r2+r3*2] |
| @@ -180,7 +180,7 @@ SECTION .text · 179 unmodified lines | ||
| 180 | 180 | %macro EPEL_FILTER 5 ; bit depth, filter index, xmma, xmmb, gprtmp |
| 181 | 181 | %if cpuflag(avx2) |
| 182 | 182 | %assign %%offset 32 |
| 183 | −%ifdef PIC | |
| 183 | +%if PIC | |
| 184 | 184 | lea %5q, [hevc_epel_filters_avx2_%1] |
| 185 | 185 | %define FILTER %5q |
| 186 | 186 | %else |
| @@ -188,7 +188,7 @@ SECTION .text · 1 unmodified line | ||
| 188 | 188 | %endif |
| 189 | 189 | %else |
| 190 | 190 | %assign %%offset 16 |
| 191 | −%ifdef PIC | |
| 191 | +%if PIC | |
| 192 | 192 | lea %5q, [hevc_epel_filters_sse4_%1] |
| 193 | 193 | %define FILTER %5q |
| 194 | 194 | %else |
| @@ -216,7 +216,7 @@ SECTION .text · 21 unmodified lines | ||
| 216 | 216 | %define %%table hevc_epel_filters_sse4_%1 |
| 217 | 217 | %endif |
| 218 | 218 | |
| 219 | −%ifdef PIC | |
| 219 | +%if PIC | |
| 220 | 220 | lea r3srcq, [%%table] |
| 221 | 221 | %define FILTER r3srcq |
| 222 | 222 | %else |
| @@ -234,7 +234,7 @@ SECTION .text · 11 unmodified lines | ||
| 234 | 234 | %else |
| 235 | 235 | %define %%table hevc_epel_filters_sse4_10 |
| 236 | 236 | %endif |
| 237 | −%ifdef PIC | |
| 237 | +%if PIC | |
| 238 | 238 | lea r3srcq, [%%table] |
| 239 | 239 | %define FILTER r3srcq |
| 240 | 240 | %else |
| @@ -257,7 +257,7 @@ SECTION .text · 16 unmodified lines | ||
| 257 | 257 | %define %%table hevc_qpel_filters_sse4_%1 |
| 258 | 258 | %endif |
| 259 | 259 | |
| 260 | −%ifdef PIC | |
| 260 | +%if PIC | |
| 261 | 261 | lea rfilterq, [%%table] |
| 262 | 262 | %else |
| 263 | 263 | %define rfilterq %%table |
| @@ -576,7 +576,7 @@ SECTION .text · 312 unmodified lines | ||
| 576 | 576 | %define %%table hevc_qpel_filters_sse4_%2 |
| 577 | 577 | %endif |
| 578 | 578 | |
| 579 | −%ifdef PIC | |
| 579 | +%if PIC | |
| 580 | 580 | lea rfilterq, [%%table] |
| 581 | 581 | %else |
| 582 | 582 | %define rfilterq %%table |
| @@ -1288,7 +1288,7 @@ HEVC_PUT_HEVC_QPEL_HV 16, 10 · 705 unmodified lines | ||
| 1288 | 1288 | %assign %%offset 4 |
| 1289 | 1289 | dec %2q |
| 1290 | 1290 | shl %2q, 3 |
| 1291 | −%ifdef PIC | |
| 1291 | +%if PIC | |
| 1292 | 1292 | lea %5q, [%%table] |
| 1293 | 1293 | %define FILTER %5q |
| 1294 | 1294 | %else |
| @@ -1365,7 +1365,7 @@ cglobal hevc_put_hevc_qpel_hv%1_%2, 6, 7, 27, dst, src, srcstride, height, mx, m · 70 unmodified lines | ||
| 1365 | 1365 | sub myq, 1 |
| 1366 | 1366 | shl myq, 5 |
| 1367 | 1367 | %define %%table hevc_qpel_filters_avx512icl_v_%1 |
| 1368 | −%ifdef PIC | |
| 1368 | +%if PIC | |
| 1369 | 1369 | lea tmpq, [%%table] |
| 1370 | 1370 | %define FILTER tmpq |
| 1371 | 1371 | %else |
| @@ -51,7 +51,7 @@ sixtap_filter_v_m: times 8 dw 1 · 50 unmodified lines | ||
| 51 | 51 | times 8 dw 20 |
| 52 | 52 | times 8 dw 52 |
| 53 | 53 | |
| 54 | −%ifdef PIC | |
| 54 | +%if PIC | |
| 55 | 55 | %define sixtap_filter_hw picregq |
| 56 | 56 | %define sixtap_filter_hb picregq |
| 57 | 57 | %define sixtap_filter_v picregq |
| @@ -84,7 +84,7 @@ SECTION .text · 26 unmodified lines | ||
| 84 | 84 | %if WIN64 |
| 85 | 85 | movsxd %1q, %1d |
| 86 | 86 | %endif |
| 87 | −%ifdef PIC | |
| 87 | +%if PIC | |
| 88 | 88 | add %1q, picregq |
| 89 | 89 | %else |
| 90 | 90 | add %1q, %2 |
| @@ -104,7 +104,7 @@ SECTION .text · 13 unmodified lines | ||
| 104 | 104 | |
| 105 | 105 | %macro FILTER_V 1 |
| 106 | 106 | cglobal %1_rv40_qpel_v, 6,6+npicregs,12, dst, dststride, src, srcstride, height, my, picreg |
| 107 | −%ifdef PIC | |
| 107 | +%if PIC | |
| 108 | 108 | lea picregq, [sixtap_filter_v_m] |
| 109 | 109 | %endif |
| 110 | 110 | pxor m7, m7 |
| @@ -175,7 +175,7 @@ cglobal %1_rv40_qpel_v, 6,6+npicregs,12, dst, dststride, src, srcstride, height, · 64 unmodified lines | ||
| 175 | 175 | |
| 176 | 176 | %macro FILTER_H 1 |
| 177 | 177 | cglobal %1_rv40_qpel_h, 6, 6+npicregs, 12, dst, dststride, src, srcstride, height, mx, picreg |
| 178 | −%ifdef PIC | |
| 178 | +%if PIC | |
| 179 | 179 | lea picregq, [sixtap_filter_v_m] |
| 180 | 180 | %endif |
| 181 | 181 | pxor m7, m7 |
| @@ -238,7 +238,7 @@ FILTER_V avg · 56 unmodified lines | ||
| 238 | 238 | |
| 239 | 239 | %macro FILTER_SSSE3 1 |
| 240 | 240 | cglobal %1_rv40_qpel_v, 6,6+npicregs,8, dst, dststride, src, srcstride, height, my, picreg |
| 241 | −%ifdef PIC | |
| 241 | +%if PIC | |
| 242 | 242 | lea picregq, [sixtap_filter_hb_m] |
| 243 | 243 | %endif |
| 244 | 244 | |
| @@ -283,7 +283,7 @@ cglobal %1_rv40_qpel_v, 6,6+npicregs,8, dst, dststride, src, srcstride, height, · 38 unmodified lines | ||
| 283 | 283 | RET |
| 284 | 284 | |
| 285 | 285 | cglobal %1_rv40_qpel_h, 6,6+npicregs,8, dst, dststride, src, srcstride, height, mx, picreg |
| 286 | −%ifdef PIC | |
| 286 | +%if PIC | |
| 287 | 287 | lea picregq, [sixtap_filter_hb_m] |
| 288 | 288 | %endif |
| 289 | 289 | mova m3, [filter_h6_shuf2] |
| @@ -308,7 +308,7 @@ cglobal sbr_qmf_pre_shuffle, 1,4,6,z · 307 unmodified lines | ||
| 308 | 308 | movq [r2q], m2 |
| 309 | 309 | RET |
| 310 | 310 | |
| 311 | −%ifdef PIC | |
| 311 | +%if PIC | |
| 312 | 312 | %define NREGS 1 |
| 313 | 313 | %if UNIX64 |
| 314 | 314 | %define NOISE_TABLE r6q ; r5q is m_max |
| @@ -321,7 +321,7 @@ cglobal sbr_qmf_pre_shuffle, 1,4,6,z · 6 unmodified lines | ||
| 321 | 321 | %endif |
| 322 | 322 | |
| 323 | 323 | %macro LOAD_NST 1 |
| 324 | −%ifdef PIC | |
| 324 | +%if PIC | |
| 325 | 325 | lea NOISE_TABLE, [%1] |
| 326 | 326 | mova m0, [kxq + NOISE_TABLE] |
| 327 | 327 | %else |
| @@ -371,7 +371,7 @@ apply_noise_main: · 43 unmodified lines | ||
| 371 | 371 | movsxdifnidn noiseq, noised |
| 372 | 372 | dec noiseq |
| 373 | 373 | shl countd, 2 |
| 374 | −%ifdef PIC | |
| 374 | +%if PIC | |
| 375 | 375 | lea NOISE_TABLE, [sbr_noise_table] |
| 376 | 376 | %endif |
| 377 | 377 | lea Yq, [Yq + 2*countq] |
| @@ -114,7 +114,7 @@ bilinear_filter_vb_m: times 8 db 7, 1 · 113 unmodified lines | ||
| 114 | 114 | times 8 db 2, 6 |
| 115 | 115 | times 8 db 1, 7 |
| 116 | 116 | |
| 117 | −%ifdef PIC | |
| 117 | +%if PIC | |
| 118 | 118 | %define fourtap_filter_hw picregq |
| 119 | 119 | %define sixtap_filter_hw picregq |
| 120 | 120 | %define fourtap_filter_hb picregq |
| @@ -166,7 +166,7 @@ cglobal put_vp8_epel%1_h6, 6, 6 + npicregs, 8, dst, dststride, src, srcstride, h · 45 unmodified lines | ||
| 166 | 166 | lea mxd, [mxq*3] |
| 167 | 167 | mova m3, [filter_h6_shuf2] |
| 168 | 168 | mova m4, [filter_h6_shuf3] |
| 169 | −%ifdef PIC | |
| 169 | +%if PIC | |
| 170 | 170 | lea picregq, [sixtap_filter_hb_m] |
| 171 | 171 | %endif |
| 172 | 172 | mova m5, [sixtap_filter_hb+mxq*8-48] ; set up 6tap filter in bytes |
| @@ -207,7 +207,7 @@ cglobal put_vp8_epel%1_h4, 6, 6 + npicregs, 7, dst, dststride, src, srcstride, h · 34 unmodified lines | ||
| 207 | 207 | mova m2, [pw_256] |
| 208 | 208 | mova m3, [filter_h2_shuf] |
| 209 | 209 | mova m4, [filter_h4_shuf] |
| 210 | −%ifdef PIC | |
| 210 | +%if PIC | |
| 211 | 211 | lea picregq, [fourtap_filter_hb_m] |
| 212 | 212 | %endif |
| 213 | 213 | mova m5, [fourtap_filter_hb+mxq-16] ; set up 4tap filter in bytes |
| @@ -234,7 +234,7 @@ cglobal put_vp8_epel%1_h4, 6, 6 + npicregs, 7, dst, dststride, src, srcstride, h · 20 unmodified lines | ||
| 234 | 234 | |
| 235 | 235 | cglobal put_vp8_epel%1_v4, 7, 7, 8, dst, dststride, src, srcstride, height, picreg, my |
| 236 | 236 | shl myd, 4 |
| 237 | −%ifdef PIC | |
| 237 | +%if PIC | |
| 238 | 238 | lea picregq, [fourtap_filter_hb_m] |
| 239 | 239 | %endif |
| 240 | 240 | mova m5, [fourtap_filter_hb+myq-16] |
| @@ -272,7 +272,7 @@ cglobal put_vp8_epel%1_v4, 7, 7, 8, dst, dststride, src, srcstride, height, picr · 31 unmodified lines | ||
| 272 | 272 | |
| 273 | 273 | cglobal put_vp8_epel%1_v6, 7, 7, 8, dst, dststride, src, srcstride, height, picreg, my |
| 274 | 274 | lea myd, [myq*3] |
| 275 | −%ifdef PIC | |
| 275 | +%if PIC | |
| 276 | 276 | lea picregq, [sixtap_filter_hb_m] |
| 277 | 277 | %endif |
| 278 | 278 | lea myq, [sixtap_filter_hb+myq*8] |
| @@ -326,7 +326,7 @@ FILTER_SSSE3 8 · 47 unmodified lines | ||
| 326 | 326 | INIT_MMX mmxext |
| 327 | 327 | cglobal put_vp8_epel4_h4, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, height, mx, picreg |
| 328 | 328 | shl mxd, 4 |
| 329 | −%ifdef PIC | |
| 329 | +%if PIC | |
| 330 | 330 | lea picregq, [fourtap_filter_hw_m] |
| 331 | 331 | %endif |
| 332 | 332 | movq mm4, [fourtap_filter_hw+mxq-16] ; set up 4tap filter in words |
| @@ -374,7 +374,7 @@ cglobal put_vp8_epel4_h4, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, he · 41 unmodified lines | ||
| 374 | 374 | INIT_MMX mmxext |
| 375 | 375 | cglobal put_vp8_epel4_h6, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, height, mx, picreg |
| 376 | 376 | lea mxd, [mxq*3] |
| 377 | −%ifdef PIC | |
| 377 | +%if PIC | |
| 378 | 378 | lea picregq, [sixtap_filter_hw_m] |
| 379 | 379 | %endif |
| 380 | 380 | movq mm4, [sixtap_filter_hw+mxq*8-48] ; set up 4tap filter in words |
| @@ -431,7 +431,7 @@ cglobal put_vp8_epel4_h6, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, he · 50 unmodified lines | ||
| 431 | 431 | INIT_XMM sse2 |
| 432 | 432 | cglobal put_vp8_epel8_h4, 6, 6 + npicregs, 10, dst, dststride, src, srcstride, height, mx, picreg |
| 433 | 433 | shl mxd, 5 |
| 434 | −%ifdef PIC | |
| 434 | +%if PIC | |
| 435 | 435 | lea picregq, [fourtap_filter_v_m] |
| 436 | 436 | %endif |
| 437 | 437 | lea mxq, [fourtap_filter_v+mxq-32] |
| @@ -480,7 +480,7 @@ INIT_XMM sse2 · 42 unmodified lines | ||
| 480 | 480 | cglobal put_vp8_epel8_h6, 6, 6 + npicregs, 14, dst, dststride, src, srcstride, height, mx, picreg |
| 481 | 481 | lea mxd, [mxq*3] |
| 482 | 482 | shl mxd, 4 |
| 483 | −%ifdef PIC | |
| 483 | +%if PIC | |
| 484 | 484 | lea picregq, [sixtap_filter_v_m] |
| 485 | 485 | %endif |
| 486 | 486 | lea mxq, [sixtap_filter_v+mxq-96] |
| @@ -543,7 +543,7 @@ cglobal put_vp8_epel8_h6, 6, 6 + npicregs, 14, dst, dststride, src, srcstride, h · 56 unmodified lines | ||
| 543 | 543 | ; 4x4 block, V-only 4-tap filter |
| 544 | 544 | cglobal put_vp8_epel%1_v4, 7, 7, 8, dst, dststride, src, srcstride, height, picreg, my |
| 545 | 545 | shl myd, 5 |
| 546 | −%ifdef PIC | |
| 546 | +%if PIC | |
| 547 | 547 | lea picregq, [fourtap_filter_v_m] |
| 548 | 548 | %endif |
| 549 | 549 | lea myq, [fourtap_filter_v+myq-32] |
| @@ -597,7 +597,7 @@ cglobal put_vp8_epel%1_v4, 7, 7, 8, dst, dststride, src, srcstride, height, picr · 47 unmodified lines | ||
| 597 | 597 | cglobal put_vp8_epel%1_v6, 7, 7, 8, dst, dststride, src, srcstride, height, picreg, my |
| 598 | 598 | shl myd, 4 |
| 599 | 599 | lea myq, [myq*3] |
| 600 | −%ifdef PIC | |
| 600 | +%if PIC | |
| 601 | 601 | lea picregq, [sixtap_filter_v_m] |
| 602 | 602 | %endif |
| 603 | 603 | lea myq, [sixtap_filter_v+myq-96] |
| @@ -667,7 +667,7 @@ FILTER_V 8 · 63 unmodified lines | ||
| 667 | 667 | %if cpuflag(ssse3) |
| 668 | 668 | cglobal put_vp8_bilinear%1_v, 7, 7, 5, dst, dststride, src, srcstride, height, picreg, my |
| 669 | 669 | shl myd, 4 |
| 670 | −%ifdef PIC | |
| 670 | +%if PIC | |
| 671 | 671 | lea picregq, [bilinear_filter_vb_m] |
| 672 | 672 | %endif |
| 673 | 673 | pxor m4, m4 |
| @@ -697,7 +697,7 @@ cglobal put_vp8_bilinear%1_v, 7, 7, 5, dst, dststride, src, srcstride, height, p · 23 unmodified lines | ||
| 697 | 697 | %else ; cpuflag(ssse3) |
| 698 | 698 | cglobal put_vp8_bilinear%1_v, 7, 7, 7, dst, dststride, src, srcstride, height, picreg, my |
| 699 | 699 | shl myd, 4 |
| 700 | −%ifdef PIC | |
| 700 | +%if PIC | |
| 701 | 701 | lea picregq, [bilinear_filter_vw_m] |
| 702 | 702 | %endif |
| 703 | 703 | pxor m6, m6 |
| @@ -743,7 +743,7 @@ cglobal put_vp8_bilinear%1_v, 7, 7, 7, dst, dststride, src, srcstride, height, p · 39 unmodified lines | ||
| 743 | 743 | %if cpuflag(ssse3) |
| 744 | 744 | cglobal put_vp8_bilinear%1_h, 6, 6 + npicregs, 5, dst, dststride, src, srcstride, height, mx, picreg |
| 745 | 745 | shl mxd, 4 |
| 746 | −%ifdef PIC | |
| 746 | +%if PIC | |
| 747 | 747 | lea picregq, [bilinear_filter_vb_m] |
| 748 | 748 | %endif |
| 749 | 749 | pxor m4, m4 |
| @@ -773,7 +773,7 @@ cglobal put_vp8_bilinear%1_h, 6, 6 + npicregs, 5, dst, dststride, src, srcstride · 23 unmodified lines | ||
| 773 | 773 | %else ; cpuflag(ssse3) |
| 774 | 774 | cglobal put_vp8_bilinear%1_h, 6, 6 + npicregs, 7, dst, dststride, src, srcstride, height, mx, picreg |
| 775 | 775 | shl mxd, 4 |
| 776 | −%ifdef PIC | |
| 776 | +%if PIC | |
| 777 | 777 | lea picregq, [bilinear_filter_vw_m] |
| 778 | 778 | %endif |
| 779 | 779 | pxor m6, m6 |
| @@ -330,7 +330,9 @@ IDCT_4x4_FN ssse3 · 329 unmodified lines | ||
| 330 | 330 | INIT_MMX %5 |
| 331 | 331 | cglobal vp9_%1_%3_4x4_add, 3, 3, 0, dst, stride, block, eob |
| 332 | 332 | %if WIN64 && notcpuflag(ssse3) |
| 333 | +INIT_XMM cpuname | |
| 333 | 334 | WIN64_SPILL_XMM 8 |
| 335 | +INIT_MMX cpuname | |
| 334 | 336 | %endif |
| 335 | 337 | movdqa xmm5, [pd_8192] |
| 336 | 338 | mova m0, [blockq+ 0] |
| @@ -303,7 +303,9 @@ IDCT4_10_FN · 302 unmodified lines | ||
| 303 | 303 | %macro IADST4_FN 4 |
| 304 | 304 | cglobal vp9_%1_%3_4x4_add_10, 3, 3, 0, dst, stride, block, eob |
| 305 | 305 | %if WIN64 && notcpuflag(ssse3) |
| 306 | +INIT_XMM cpuname | |
| 306 | 307 | WIN64_SPILL_XMM 8 |
| 308 | +INIT_MMX cpuname | |
| 307 | 309 | %endif |
| 308 | 310 | movdqa xmm5, [pd_8192] |
| 309 | 311 | mova m0, [blockq+0*16+0] |
| @@ -672,7 +674,7 @@ cglobal vp9_idct_idct_8x8_add_10, 4, 6 + ARCH_X86_64, 14, \ · 362 unmodified lines | ||
| 672 | 674 | mov dstbakq, dstq |
| 673 | 675 | movsxd cntq, cntd |
| 674 | 676 | %endif |
| 675 | −%ifdef PIC | |
| 677 | +%if PIC | |
| 676 | 678 | lea ptrq, [default_8x8] |
| 677 | 679 | movzx cntd, byte [ptrq+cntq-1] |
| 678 | 680 | %else |
| @@ -921,7 +923,7 @@ cglobal vp9_%1_%3_8x8_add_10, 4, 6 + ARCH_X86_64, 16, \ · 242 unmodified lines | ||
| 921 | 923 | mov dstbakq, dstq |
| 922 | 924 | movsxd cntq, cntd |
| 923 | 925 | %endif |
| 924 | −%ifdef PIC | |
| 926 | +%if PIC | |
| 925 | 927 | lea ptrq, [%5_8x8] |
| 926 | 928 | movzx cntd, byte [ptrq+cntq-1] |
| 927 | 929 | %else |
| @@ -1128,7 +1130,7 @@ cglobal vp9_idct_idct_16x16_add_10, 4, 6 + ARCH_X86_64, 16, \ · 200 unmodified lines | ||
| 1128 | 1130 | mov dstbakq, dstq |
| 1129 | 1131 | movsxd cntq, cntd |
| 1130 | 1132 | %endif |
| 1131 | −%ifdef PIC | |
| 1133 | +%if PIC | |
| 1132 | 1134 | lea ptrq, [default_16x16] |
| 1133 | 1135 | movzx cntd, byte [ptrq+cntq-1] |
| 1134 | 1136 | %else |
| @@ -1445,7 +1447,7 @@ cglobal vp9_%1_%4_16x16_add_10, 4, 6 + ARCH_X86_64, 16, \ · 310 unmodified lines | ||
| 1445 | 1447 | mov dstbakq, dstq |
| 1446 | 1448 | movsxd cntq, cntd |
| 1447 | 1449 | %endif |
| 1448 | −%ifdef PIC | |
| 1450 | +%if PIC | |
| 1449 | 1451 | lea ptrq, [%7_16x16] |
| 1450 | 1452 | movzx cntd, byte [ptrq+cntq-1] |
| 1451 | 1453 | %else |
| @@ -1958,7 +1960,7 @@ cglobal vp9_idct_idct_32x32_add_10, 4, 6 + ARCH_X86_64, 16, \ · 506 unmodified lines | ||
| 1958 | 1960 | mov dstbakq, dstq |
| 1959 | 1961 | movsxd cntq, cntd |
| 1960 | 1962 | %endif |
| 1961 | −%ifdef PIC | |
| 1963 | +%if PIC | |
| 1962 | 1964 | lea ptrq, [default_32x32] |
| 1963 | 1965 | movzx cntd, byte [ptrq+cntq-1] |
| 1964 | 1966 | %else |