generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use movsxd in SIGN_EXTENSION

Browse Source 
This is what nasm ended up assembling movsx with 32 bit input to
anyway.

Keep using plain movsx for 16 bit input.

This fixes building with yasm in 64 bit mode.
This commit is contained in:
Martin Storsjö 2014-03-15 13:52:21 +02:00
parent 918b211990
commit 04f5bcd68d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/common/asm_inc.asm
View File

@ -336,6 +336,12 @@ BITS 32
%endmacro
%macro SIGN_EXTENSION 2
%ifndef X86_32
movsxd %1, %2
%endif
%endmacro
%macro SIGN_EXTENSIONW 2
%ifndef X86_32
movsx %1, %2
%endif

12
codec/encoder/core/asm/quant.asm
View File

@ -103,8 +103,8 @@ align 16
WelsQuant4x4Dc_sse2:
%assign push_num 0
LOAD_3_PARA
SIGN_EXTENSION r1, r1w
SIGN_EXTENSION r2, r2w
SIGN_EXTENSIONW r1, r1w
SIGN_EXTENSIONW r2, r2w
SSE2_Copy8Times xmm3, r2d
SSE2_Copy8Times xmm2, r1d
@ -199,8 +199,8 @@ align 16
WelsHadamardQuant2x2_mmx:
%assign push_num 0
LOAD_5_PARA
SIGN_EXTENSION r1, r1w
SIGN_EXTENSION r2, r2w
SIGN_EXTENSIONW r1, r1w
SIGN_EXTENSIONW r2, r2w
movd mm0, [r0]
movd mm1, [r0 + 0x20]
punpcklwd mm0, mm1
@ -257,8 +257,8 @@ align 16
WelsHadamardQuant2x2Skip_mmx:
%assign push_num 0
LOAD_3_PARA
SIGN_EXTENSION r1, r1w
SIGN_EXTENSION r2, r2w
SIGN_EXTENSIONW r1, r1w
SIGN_EXTENSIONW r2, r2w
movd mm0, [r0]
movd mm1, [r0 + 0x20]
punpcklwd mm0, mm1