[x264-devel] commit: cosmetics in asm (Loren Merritt )

git version control git at videolan.org
Thu Mar 20 02:11:18 CET 2008


x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Wed Mar 19 14:03:34 2008 -0600| [123f29a18afc120d9c6ccca1c32e8054124051b2]

cosmetics in asm

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=123f29a18afc120d9c6ccca1c32e8054124051b2
---

 common/x86/mc-a.asm      |   16 +++++++---------
 common/x86/pixel-32.asm  |    2 +-
 common/x86/x86inc-64.asm |    6 +++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/common/x86/mc-a.asm b/common/x86/mc-a.asm
index 3d1db63..0296fbd 100644
--- a/common/x86/mc-a.asm
+++ b/common/x86/mc-a.asm
@@ -341,10 +341,10 @@ cglobal x264_mc_copy_w16_mmx, 5,7
     jg      .height_loop
     REP_RET
 
-cglobal x264_mc_copy_w16_sse2,5,7
+cglobal x264_mc_copy_w16_sse2, 5,7
     lea     r6, [r3*3]
     lea     r5, [r1*3]
-.height_loop
+.height_loop:
     movdqu  xmm0, [r2]
     movdqu  xmm1, [r2+r3]
     movdqu  xmm2, [r2+r3*2]
@@ -583,7 +583,7 @@ cglobal x264_mc_chroma_mmxext, 0,6,1
 %endif
 
 ALIGN 4
-.height_loop
+.height_loop:
 
     movd    mm1, [r2+r3]
     movd    mm0, [r2]
@@ -628,11 +628,8 @@ ALIGN 4
     mov     r4d, r7m            ; i_height
     jmp     .height_loop
 
-.finish
-    REP_RET
-
 ALIGN 4
-.mc1d
+.mc1d:
     mov       eax, r4d
     or        eax, r5d
     and       eax, 7
@@ -652,7 +649,7 @@ ALIGN 4
     je .height_loop1_w8
 
 ALIGN 4
-.height_loop1_w4
+.height_loop1_w4:
     movd      mm0, [r2+r5]
     movd      mm1, [r2]
     punpcklbw mm0, mm3
@@ -668,10 +665,11 @@ ALIGN 4
     add       r0,  r1
     dec       r4d
     jnz .height_loop1_w4
+.finish:
     REP_RET
 
 ALIGN 4
-.height_loop1_w8
+.height_loop1_w8:
     movq      mm0, [r2+r5]
     movq      mm1, [r2]
     movq      mm2, mm0
diff --git a/common/x86/pixel-32.asm b/common/x86/pixel-32.asm
index 9807178..44d27ad 100644
--- a/common/x86/pixel-32.asm
+++ b/common/x86/pixel-32.asm
@@ -408,7 +408,7 @@ cglobal x264_pixel_ssim_4x4x2_core_mmxext
     mov       edx, [esp+24]
     mov       edi, 4
     pxor      mm0, mm0
-.loop
+.loop:
     mov       eax, [esp+12]
     mov       ecx, [esp+20]
     add       eax, edi
diff --git a/common/x86/x86inc-64.asm b/common/x86/x86inc-64.asm
index f09a0dc..2476470 100644
--- a/common/x86/x86inc-64.asm
+++ b/common/x86/x86inc-64.asm
@@ -196,9 +196,9 @@ BITS 64
 %endmacro
 
 %macro endprolog 0
-.endprolog
+.endprolog:
 SECTION .xdata
-.unwindinfo
+.unwindinfo:
     db 0x01
     db .endprolog-.startfunc
     db unwindcount
@@ -212,7 +212,7 @@ SECTION .text
 %endmacro
 
 %macro endfunc 0
-.endfunc
+.endfunc:
 SECTION .pdata
     dd .startfunc
     dd .endfunc



More information about the x264-devel mailing list