[FFmpeg-devel] [PATCH 2/5] avcodec/h264: change some labels to be macro-local

[James Darnley]

The labels get stripped leading to (slightly) nicer disassembly from
objdump.
---
 libavcodec/x86/h264_idct.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
index 878ff02..dde40e9 100644
--- a/libavcodec/x86/h264_idct.asm
+++ b/libavcodec/x86/h264_idct.asm
@@ -846,7 +846,7 @@ h264_add8x4_idct_sse2:
 %macro add16_sse2_cycle 2
     movzx       r0, word [r4+%2]
     test        r0, r0
-    jz .cycle%1end
+    jz %%skip
     mov        r0d, dword [r1+%1*8]
 %if ARCH_X86_64
     add         r0, r5
@@ -854,7 +854,7 @@ h264_add8x4_idct_sse2:
     add         r0, r0m
 %endif
     call        h264_add8x4_idct_sse2
-.cycle%1end:
+%%skip:
 %if %1 < 7
     add         r2, 64
 %endif
@@ -883,7 +883,7 @@ REP_RET
 %macro add16intra_sse2_cycle 2
     movzx       r0, word [r4+%2]
     test        r0, r0
-    jz .try%1dc
+    jz %%trydc
     mov        r0d, dword [r1+%1*8]
 %if ARCH_X86_64
     add         r0, r7
@@ -891,11 +891,11 @@ REP_RET
     add         r0, r0m
 %endif
     call        h264_add8x4_idct_sse2
-    jmp .cycle%1end
-.try%1dc:
+    jmp %%skip
+%%trydc:
     movsx       r0, word [r2   ]
     or         r0w, word [r2+32]
-    jz .cycle%1end
+    jz %%skip
     mov        r0d, dword [r1+%1*8]
 %if ARCH_X86_64
     add         r0, r7
@@ -903,7 +903,7 @@ REP_RET
     add         r0, r0m
 %endif
     call        h264_idct_dc_add8_mmxext
-.cycle%1end:
+%%skip:
 %if %1 < 7
     add         r2, 64
 %endif
@@ -930,7 +930,7 @@ REP_RET
 %macro add8_sse2_cycle 2
     movzx       r0, word [r4+%2]
     test        r0, r0
-    jz .try%1dc
+    jz %%trydc
 %if ARCH_X86_64
     mov        r0d, dword [r1+(%1&1)*8+64*(1+(%1>>1))]
     add         r0, [r7]
@@ -940,11 +940,11 @@ REP_RET
     add         r0, dword [r1+(%1&1)*8+64*(1+(%1>>1))]
 %endif
     call        h264_add8x4_idct_sse2
-    jmp .cycle%1end
-.try%1dc:
+    jmp %%cycle_end
+%%trydc:
     movsx       r0, word [r2   ]
     or         r0w, word [r2+32]
-    jz .cycle%1end
+    jz %%cycle_end
 %if ARCH_X86_64
     mov        r0d, dword [r1+(%1&1)*8+64*(1+(%1>>1))]
     add         r0, [r7]
@@ -954,7 +954,7 @@ REP_RET
     add         r0, dword [r1+(%1&1)*8+64*(1+(%1>>1))]
 %endif
     call        h264_idct_dc_add8_mmxext
-.cycle%1end:
+%%cycle_end:
 %if %1 == 1
     add         r2, 384+64
 %elif %1 < 3
-- 
2.8.3