diff options
| author | James Zern <jzern@google.com> | 2017-10-03 21:47:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-03 21:47:49 +0000 |
| commit | 66b6b87471620a9eba2e7fb5e687b8f0e630be66 (patch) | |
| tree | f034b4ada95a532eaa4db3737d598048e7cfb873 /vpx_dsp | |
| parent | c8678fb7f38024345462cfab3b34d649548ff445 (diff) | |
| parent | bc4bc9b6223df26d34f5576da32fa412f01d865e (diff) | |
| download | libvpx-66b6b87471620a9eba2e7fb5e687b8f0e630be66.tar libvpx-66b6b87471620a9eba2e7fb5e687b8f0e630be66.tar.gz libvpx-66b6b87471620a9eba2e7fb5e687b8f0e630be66.tar.bz2 libvpx-66b6b87471620a9eba2e7fb5e687b8f0e630be66.zip | |
Merge "vpx: fix nasm build errors"
Diffstat (limited to 'vpx_dsp')
| -rw-r--r-- | vpx_dsp/x86/add_noise_sse2.asm | 4 | ||||
| -rw-r--r-- | vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm | 2 | ||||
| -rw-r--r-- | vpx_dsp/x86/intrapred_sse2.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vpx_dsp/x86/add_noise_sse2.asm b/vpx_dsp/x86/add_noise_sse2.asm index f758da22d..af48adc31 100644 --- a/vpx_dsp/x86/add_noise_sse2.asm +++ b/vpx_dsp/x86/add_noise_sse2.asm @@ -26,13 +26,13 @@ sym(vpx_plane_add_noise_sse2): 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 diff --git a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm index 30ee81b68..d9a6932e0 100644 --- a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm +++ b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm @@ -72,7 +72,7 @@ SECTION .text 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 diff --git a/vpx_dsp/x86/intrapred_sse2.asm b/vpx_dsp/x86/intrapred_sse2.asm index c18095c28..61af6236e 100644 --- a/vpx_dsp/x86/intrapred_sse2.asm +++ b/vpx_dsp/x86/intrapred_sse2.asm @@ -61,7 +61,7 @@ cglobal d45_predictor_4x4, 3, 4, 4, dst, stride, above, goffset psrlq m3, 8 movd [dstq+strideq ], m3 psrlq m0, 56 - movd tempq, m0 + movd tempd, m0 mov [dstq+strideq+3], tempb RESTORE_GOT |