From patchwork Wed Apr 5 01:53:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3299 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp55082vss; Tue, 4 Apr 2017 19:02:07 -0700 (PDT) X-Received: by 10.28.151.137 with SMTP id z131mr15899832wmd.138.1491357726998; Tue, 04 Apr 2017 19:02:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 35si23014777wrz.258.2017.04.04.19.02.06; Tue, 04 Apr 2017 19:02:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60DE768829E; Wed, 5 Apr 2017 05:02:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD3CB680949 for ; Wed, 5 Apr 2017 05:01:56 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id w43so44268078wrb.1 for ; Tue, 04 Apr 2017 19:01:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=pO2A1gaXt0UsV80o/Z+r8c139bzfO8/FrZHmnAcQS/I=; b=PN6PsXrKyhLphXAoNUlNOQO8o+st0ZZwrTgOgPtAa1mEkuoj/5gSQi4zhXm+5gaQDh dtDemOqk7F5oF8KCti/nBnCEkfnPxm3D6d6C+VLzSX6lXjSrP1p1YL3BN/yqQCngoZjY Oyr5kAXLn+JF4DoZInzjb0UXRD2iYb+Rlw+VlIv1/foFhdmqks/9FzRSbcUm/YWibIMA if0J9YVjYBHRHAtN5vo6hQ1hRYiaP1ombE3zZLbZ70KJJ/cNuZf+niKBd51WxUYWVWdf Pr3fnYwZkodR5g3wwRXEx5AQj3sdxhtKAfM5eJQmbktfyG3VSC8wZFtdlt4OVCwofsWh M3XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=pO2A1gaXt0UsV80o/Z+r8c139bzfO8/FrZHmnAcQS/I=; b=slLhm3d22HPhSifgVFTQD2uaWq1qg3rafzwmvloIAL18YNVytJ5UT0V+tX+Mj2lJ6O bDkF5uGSGuaN7E/WAZocd4BCW9hqo1LBX7S3WYMGpC9bq3tO5zkY0k5nLLbbZxSn4vSo nq8M5ZxIkavTAu03k3Dj0UKTGn9kaVmwfCfxr0hJmIxJZKsH1j+PHy4JQAO2aBgmspjo xzdGSa+cCufqRLG/ya4xOycrIndKEr2zigUCXtx7Tsyd0+Tp1LixgqbRDqTRdGutDsot lokNYLVquZwhs4iVl04NtrIgmCh7zI+jFGQQy78emEiVm2Xau26AoG8WYo+bFiYY6bt0 +QaQ== X-Gm-Message-State: AFeK/H0z9E/T6R1ejl4n7exDKQnhQaOP5pqzTaJ45CArxR1XRyo8PfJvL0ygalWJ7IA/Tw== X-Received: by 10.223.136.92 with SMTP id e28mr21252149wre.73.1491357215193; Tue, 04 Apr 2017 18:53:35 -0700 (PDT) Received: from localhost.localdomain (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id o66sm20381630wmg.33.2017.04.04.18.53.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 18:53:34 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Wed, 5 Apr 2017 03:53:25 +0200 Message-Id: <20170405015328.5476-3-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170405015328.5476-1-jdarnley@obe.tv> References: <20170405015328.5476-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/h264: change some labels to be macro-local X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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