Cosmetic changes to h264_idct_10bit.asm.

Removes redundant dword tags and whitespace changes.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Loren Merritt
2011-06-01 01:01:01 -04:00
committed by Ronald S. Bultje
parent 994c3550ff
commit 53be7b23e9

View File

@@ -133,7 +133,7 @@ ADD4x4IDCT avx
%macro ADD16_OP 3 %macro ADD16_OP 3
cmp byte [r4+%3], 0 cmp byte [r4+%3], 0
jz .skipblock%2 jz .skipblock%2
mov r5d, dword [r1+%2*4] mov r5d, [r1+%2*4]
call add4x4_idct_%1 call add4x4_idct_%1
.skipblock%2: .skipblock%2:
%if %2<15 %if %2<15
@@ -159,7 +159,7 @@ cglobal h264_idct_add16_10_%1, 5,6
ADD16_OP %1, 13, 7+3*8 ADD16_OP %1, 13, 7+3*8
ADD16_OP %1, 14, 6+4*8 ADD16_OP %1, 14, 6+4*8
ADD16_OP %1, 15, 7+4*8 ADD16_OP %1, 15, 7+4*8
RET REP_RET
%endmacro %endmacro
INIT_XMM INIT_XMM
@@ -201,7 +201,7 @@ IDCT_ADD16_10 avx
INIT_MMX INIT_MMX
cglobal h264_idct_dc_add_10_mmx2,3,3 cglobal h264_idct_dc_add_10_mmx2,3,3
movd m0, dword [r1] movd m0, [r1]
paddd m0, [pd_32] paddd m0, [pd_32]
psrad m0, 6 psrad m0, 6
lea r1, [r2*3] lea r1, [r2*3]
@@ -215,7 +215,7 @@ cglobal h264_idct_dc_add_10_mmx2,3,3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro IDCT8_DC_ADD 1 %macro IDCT8_DC_ADD 1
cglobal h264_idct8_dc_add_10_%1,3,3,7 cglobal h264_idct8_dc_add_10_%1,3,3,7
mov r1d, dword [r1] mov r1d, [r1]
add r1, 32 add r1, 32
sar r1, 6 sar r1, 6
movd m0, r1d movd m0, r1d
@@ -240,9 +240,9 @@ IDCT8_DC_ADD avx
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro AC 2 %macro AC 2
.ac%2 .ac%2
mov r5d, dword [r1+(%2+0)*4] mov r5d, [r1+(%2+0)*4]
call add4x4_idct_%1 call add4x4_idct_%1
mov r5d, dword [r1+(%2+1)*4] mov r5d, [r1+(%2+1)*4]
add r2, 64 add r2, 64
call add4x4_idct_%1 call add4x4_idct_%1
add r2, 64 add r2, 64
@@ -253,10 +253,10 @@ IDCT8_DC_ADD avx
%macro ADD16_OP_INTRA 3 %macro ADD16_OP_INTRA 3
cmp word [r4+%3], 0 cmp word [r4+%3], 0
jnz .ac%2 jnz .ac%2
mov r5d, dword [r2+ 0] mov r5d, [r2+ 0]
or r5d, dword [r2+64] or r5d, [r2+64]
jz .skipblock%2 jz .skipblock%2
mov r5d, dword [r1+(%2+0)*4] mov r5d, [r1+(%2+0)*4]
call idct_dc_add_%1 call idct_dc_add_%1
.skipblock%2: .skipblock%2:
%if %2<last_block-2 %if %2<last_block-2
@@ -288,12 +288,15 @@ cglobal h264_idct_add16intra_10_%1,5,7,8
ADD16_OP_INTRA %1, 10, 4+4*8 ADD16_OP_INTRA %1, 10, 4+4*8
ADD16_OP_INTRA %1, 12, 6+3*8 ADD16_OP_INTRA %1, 12, 6+3*8
ADD16_OP_INTRA %1, 14, 6+4*8 ADD16_OP_INTRA %1, 14, 6+4*8
RET REP_RET
%assign i 14 AC %1, 8
%rep 8 AC %1, 10
AC %1, i AC %1, 12
%assign i i-2 AC %1, 14
%endrep AC %1, 0
AC %1, 2
AC %1, 4
AC %1, 6
%endmacro %endmacro
INIT_XMM INIT_XMM
@@ -523,7 +526,7 @@ IDCT8_ADD avx
%macro IDCT8_ADD4_OP 3 %macro IDCT8_ADD4_OP 3
cmp byte [r4+%3], 0 cmp byte [r4+%3], 0
jz .skipblock%2 jz .skipblock%2
mov r0d, dword [r6+%2*4] mov r0d, [r6+%2*4]
add r0, r5 add r0, r5
call h264_idct8_add1_10_%1 call h264_idct8_add1_10_%1
.skipblock%2: .skipblock%2: