summaryrefslogtreecommitdiff
path: root/vp8
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-07-01 07:14:34 -0700
committerCode Review <code-review@webmproject.org>2011-07-01 07:14:34 -0700
commitb4f70084cc64b8304005a385cb0a670431aced20 (patch)
tree3c49ea12d9ccede8138581d07fe850ea82a5d91d /vp8
parentae8aa836d5a4c81e680d035f84eeed4dc8e4c765 (diff)
parentc8a23ad3f44fdd70fbe759d3d6e27f1e03fb37b9 (diff)
downloadlibvpx-b4f70084cc64b8304005a385cb0a670431aced20.tar
libvpx-b4f70084cc64b8304005a385cb0a670431aced20.tar.gz
libvpx-b4f70084cc64b8304005a385cb0a670431aced20.tar.bz2
libvpx-b4f70084cc64b8304005a385cb0a670431aced20.zip
Merge "Properly use GET_GOT/RESTORE_GOT when using GLOBAL()."
Diffstat (limited to 'vp8')
-rw-r--r--vp8/common/x86/recon_sse2.asm8
1 files changed, 7 insertions, 1 deletions
diff --git a/vp8/common/x86/recon_sse2.asm b/vp8/common/x86/recon_sse2.asm
index 00b74387c..0e23116ce 100644
--- a/vp8/common/x86/recon_sse2.asm
+++ b/vp8/common/x86/recon_sse2.asm
@@ -593,8 +593,11 @@ sym(vp8_intra_pred_uv_ho_%1):
push rsi
push rdi
%ifidn %1, ssse3
+%ifndef GET_GOT_SAVE_ARG
push rbx
%endif
+ GET_GOT rbx
+%endif
; end prolog
; read from left and write out
@@ -606,9 +609,9 @@ sym(vp8_intra_pred_uv_ho_%1):
mov rdi, arg(0) ;dst;
movsxd rcx, dword ptr arg(1) ;dst_stride
%ifidn %1, ssse3
- lea rbx, [rax*3]
lea rdx, [rcx*3]
movdqa xmm2, [GLOBAL(dc_00001111)]
+ lea rbx, [rax*3]
%endif
dec rsi
%ifidn %1, mmx2
@@ -656,8 +659,11 @@ vp8_intra_pred_uv_ho_%1_loop:
; begin epilog
%ifidn %1, ssse3
+ RESTORE_GOT
+%ifndef GET_GOT_SAVE_ARG
pop rbx
%endif
+%endif
pop rdi
pop rsi
UNSHADOW_ARGS