diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-02 00:05:10 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-02 00:05:10 -0400 |
| commit | 5380a2215e49f88d4db5e13997055717faec8d1c (patch) | |
| tree | 79a60d97f0a24b99c4b924cda4d5b9c46e988d06 /vp8/common/x86 | |
| parent | 9b8f82779d7029df39017307c65a0d0f2c958fdf (diff) | |
| parent | b4f70084cc64b8304005a385cb0a670431aced20 (diff) | |
| download | libvpx-5380a2215e49f88d4db5e13997055717faec8d1c.tar libvpx-5380a2215e49f88d4db5e13997055717faec8d1c.tar.gz libvpx-5380a2215e49f88d4db5e13997055717faec8d1c.tar.bz2 libvpx-5380a2215e49f88d4db5e13997055717faec8d1c.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/common/x86')
| -rw-r--r-- | vp8/common/x86/recon_sse2.asm | 8 |
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 |