ref: 66b6b87471620a9eba2e7fb5e687b8f0e630be66
parent: c8678fb7f38024345462cfab3b34d649548ff445
parent: bc4bc9b6223df26d34f5576da32fa412f01d865e
author: James Zern <jzern@google.com>
date: Tue Oct 3 17:47:49 EDT 2017
Merge "vpx: fix nasm build errors"
--- a/vpx_dsp/x86/add_noise_sse2.asm
+++ b/vpx_dsp/x86/add_noise_sse2.asm
@@ -26,13 +26,13 @@
mov rdx, 0x01010101
mov rax, arg(2)
mul rdx
- movd xmm3, rax
+ movq xmm3, rax
pshufd xmm3, xmm3, 0 ; xmm3 is 16 copies of char in blackclamp
mov rdx, 0x01010101
mov rax, arg(3)
mul rdx
- movd xmm4, rax
+ movq xmm4, rax
pshufd xmm4, xmm4, 0 ; xmm4 is 16 copies of char in whiteclamp
movdqu xmm5, xmm3 ; both clamp = black clamp + white clamp
--- a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
+++ b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
@@ -72,7 +72,7 @@
paddd m6, m4
mov r1, ssem ; r1 = unsigned int *sse
movd [r1], m7 ; store sse
- movd rax, m6 ; store sum as return value
+ movd eax, m6 ; store sum as return value
%endif
RET
%endmacro
--- a/vpx_dsp/x86/intrapred_sse2.asm
+++ b/vpx_dsp/x86/intrapred_sse2.asm
@@ -61,7 +61,7 @@
psrlq m3, 8
movd [dstq+strideq ], m3
psrlq m0, 56
- movd tempq, m0
+ movd tempd, m0
mov [dstq+strideq+3], tempb
RESTORE_GOT