Skip to content

Commit

Permalink
Merge "*.asm: normalize label format"
Browse files Browse the repository at this point in the history
  • Loading branch information
jzern authored and Gerrit Code Review committed Jun 28, 2016
2 parents b2d6901 + f51f676 commit 0afe5e4
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions vp8/common/x86/mfqe_sse2.asm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ sym(vp8_filter_by_weight16x16_sse2):
mov rcx, 16 ; loop count
pxor xmm6, xmm6

.combine
.combine:
movdqa xmm2, [rax]
movdqa xmm4, [rdx]
add rax, rsi
Expand Down Expand Up @@ -122,7 +122,7 @@ sym(vp8_filter_by_weight8x8_sse2):
mov rcx, 8 ; loop count
pxor xmm4, xmm4

.combine
.combine:
movq xmm2, [rax]
movq xmm3, [rdx]
add rax, rsi
Expand Down Expand Up @@ -189,7 +189,7 @@ sym(vp8_variance_and_sad_16x16_sse2):

; Because we're working with the actual output frames
; we can't depend on any kind of data alignment.
.accumulate
.accumulate:
movdqa xmm0, [rax] ; src1
movdqa xmm1, [rdx] ; src2
add rax, rcx ; src1 + stride1
Expand Down
6 changes: 3 additions & 3 deletions vp8/common/x86/postproc_mmx.asm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ sym(vp8_mbpost_proc_down_mmx):
lea rdi, [rdi+rdx]
movq mm1, QWORD ptr[rdi] ; first row
mov rcx, 8
.init_borderd ; initialize borders
.init_borderd: ; initialize borders
lea rdi, [rdi + rax]
movq [rdi], mm1

Expand All @@ -72,7 +72,7 @@ sym(vp8_mbpost_proc_down_mmx):
mov rdi, rsi
movq mm1, QWORD ptr[rdi] ; first row
mov rcx, 8
.init_border ; initialize borders
.init_border: ; initialize borders
lea rdi, [rdi + rax]
movq [rdi], mm1

Expand Down Expand Up @@ -213,7 +213,7 @@ sym(vp8_mbpost_proc_down_mmx):
movd mm1, DWORD PTR [rsp+rcx*4] ;d[rcx*4]
movd [rsi], mm1

.skip_assignment
.skip_assignment:
lea rsi, [rsi+rax]

lea rdi, [rdi+rax]
Expand Down
8 changes: 4 additions & 4 deletions vp8/common/x86/postproc_sse2.asm
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ sym(vp8_post_proc_down_and_across_mb_row_sse2):
UPDATE_FLIMIT
jmp .acrossnextcol

.acrossdone
.acrossdone:
; last 16 pixels
movq QWORD PTR [rdi+rdx-16], mm0

Expand Down Expand Up @@ -278,7 +278,7 @@ sym(vp8_mbpost_proc_down_xmm):
lea rdi, [rdi+rdx]
movq xmm1, QWORD ptr[rdi] ; first row
mov rcx, 8
.init_borderd ; initialize borders
.init_borderd: ; initialize borders
lea rdi, [rdi + rax]
movq [rdi], xmm1

Expand All @@ -291,7 +291,7 @@ sym(vp8_mbpost_proc_down_xmm):
mov rdi, rsi
movq xmm1, QWORD ptr[rdi] ; first row
mov rcx, 8
.init_border ; initialize borders
.init_border: ; initialize borders
lea rdi, [rdi + rax]
movq [rdi], xmm1

Expand Down Expand Up @@ -434,7 +434,7 @@ sym(vp8_mbpost_proc_down_xmm):
movq mm0, [rsp + rcx*8] ;d[rcx*8]
movq [rsi], mm0

.skip_assignment
.skip_assignment:
lea rsi, [rsi+rax]

lea rdi, [rdi+rax]
Expand Down
6 changes: 3 additions & 3 deletions vp9/common/x86/vp9_mfqe_sse2.asm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sym(vp9_filter_by_weight16x16_sse2):
mov rcx, 16 ; loop count
pxor xmm6, xmm6

.combine
.combine:
movdqa xmm2, [rax]
movdqa xmm4, [rdx]
add rax, rsi
Expand Down Expand Up @@ -123,7 +123,7 @@ sym(vp9_filter_by_weight8x8_sse2):
mov rcx, 8 ; loop count
pxor xmm4, xmm4

.combine
.combine:
movq xmm2, [rax]
movq xmm3, [rdx]
add rax, rsi
Expand Down Expand Up @@ -190,7 +190,7 @@ sym(vp9_variance_and_sad_16x16_sse2):

; Because we're working with the actual output frames
; we can't depend on any kind of data alignment.
.accumulate
.accumulate:
movdqa xmm0, [rax] ; src1
movdqa xmm1, [rdx] ; src2
add rax, rcx ; src1 + stride1
Expand Down
2 changes: 1 addition & 1 deletion vpx_dsp/x86/intrapred_sse2.asm
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ cglobal tm_predictor_8x8, 4, 4, 5, dst, stride, above, left
psubw m0, m2 ; t1-tl t2-tl ... t8-tl [word]
movq m2, [leftq]
punpcklbw m2, m1 ; l1 l2 l3 l4 l5 l6 l7 l8 [word]
.loop
.loop:
pshuflw m4, m2, 0x0 ; [63:0] l1 l1 l1 l1 [word]
pshuflw m3, m2, 0x55 ; [63:0] l2 l2 l2 l2 [word]
punpcklqdq m4, m4 ; l1 l1 l1 l1 l1 l1 l1 l1 [word]
Expand Down
2 changes: 1 addition & 1 deletion vpx_dsp/x86/vpx_convolve_copy_sse2.asm
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ cglobal convolve_%1, 4, 7, 4+AUX_XMM_REGS, src, src_stride, \
RET
%endif

.w64
.w64:
mov r4d, dword hm
.loop64:
movu m0, [srcq]
Expand Down
2 changes: 1 addition & 1 deletion vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ cglobal filter_block1d4_%1, 6, 6+(ARCH_X86_64*2), 11, LOCAL_VARS_SIZE, \
pavgb m1, m0
%endif
movd [dstq], m1
.done
.done:
RET
%endm

Expand Down

0 comments on commit 0afe5e4

Please sign in to comment.