ref: d3a1ebad5226e2510ca65ef02e148967511df7b3
parent: da5a5df86c334d60865898033ec17744e73d32dd
author: Ronald S. Bultje <[email protected]>
date: Thu Dec 6 05:22:24 EST 2018
Fix mc.avg/w_avg/mask for x86-32
--- a/src/x86/mc_init_tmpl.c
+++ b/src/x86/mc_init_tmpl.c
@@ -77,7 +77,7 @@
if(!(flags & DAV1D_X86_CPU_FLAG_SSSE3))
return;
-#if BITDEPTH == 8 && ARCH_X86_64
+#if BITDEPTH == 8
c->avg = dav1d_avg_ssse3;
c->w_avg = dav1d_w_avg_ssse3;
c->mask = dav1d_mask_ssse3;
--- a/src/x86/mc_ssse3.asm
+++ b/src/x86/mc_ssse3.asm
@@ -27,8 +27,6 @@
%include "config.asm"
%include "ext/x86/x86inc.asm"
-%if ARCH_X86_64
-
SECTION_RODATA 16
pw_1024: times 8 dw 1024
@@ -237,15 +235,19 @@
add tmp2q, %1*mmsize
%endmacro
+%if ARCH_X86_64
cglobal mask, 4, 8, 7, dst, stride, tmp1, tmp2, w, h, mask, stride3
- lea r7, [mask_ssse3_table]
- tzcnt wd, wm
movifnidn hd, hm
- mov maskq, maskmp
- movsxd wq, dword [r7+wq*4]
+%else
+cglobal mask, 4, 7, 7, dst, stride, tmp1, tmp2, w, mask, stride3
+%define hd dword r5m
+%endif
+ lea r6, [mask_ssse3_table]
+ tzcnt wd, wm
+ movsxd wq, dword [r6+wq*4]
pxor m4, m4
- mova m5, [pw_2048+r7-mask_ssse3_table]
- add wq, r7
+ mova m5, [pw_2048+r6-mask_ssse3_table]
+ add wq, r6
+ mov maskq, r6m
BIDIR_FN MASK
-
-%endif ; ARCH_X86_64
+%undef hd