From patchwork Sat Apr 15 01:46:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3422 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp449919vsd; Fri, 14 Apr 2017 18:55:09 -0700 (PDT) X-Received: by 10.223.133.195 with SMTP id 3mr9604075wru.173.1492221309005; Fri, 14 Apr 2017 18:55:09 -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 b128si859858wmb.79.2017.04.14.18.55.08; Fri, 14 Apr 2017 18:55:08 -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 67896689811; Sat, 15 Apr 2017 04:54:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07F7168824F for ; Sat, 15 Apr 2017 04:54:52 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id d79so905353wmi.2 for ; Fri, 14 Apr 2017 18:54:58 -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=GSgAMCgUI4LPWvV8jNP+tf0xPJQdFA0pQIh19lPIgrwAdqU0VQXm6vOPlUHcaS+CpS yjcnCoPi8qLGXQrKfzMX4QCyd8M7qNEtzYNWbMXTenN8+MaMr8an/WadqDD7z7REPZyB pv4dkarIHqOuTTnxZDraIgxOcBo6KGSuMy4DTIl5CV2Jft0z+ssenwzebyGu2FIkZqur 224mirdS+hEBAYSUmCCxGhBiJJWJCJUwacKGAPd4+0egw4HRpRRwFlugO4IdejSR0EuW BbmScoewjHDz6KNAeSkOFtbxhkjGTICB4l9fHQwwNmRA/81GB9thIyA+UqoDOBl8A+h+ BMxg== 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=b1rm+Rir6U2Q/kmkY6uZgo0pX4XBLRLnlpp4xFc8zQlSA1c485+FQAPfOdMgiyAKGd IGowbS6W9WzJ5ny1VFf70nOJb8ldFM74D2lHF4tLC+Rmbfhe8spwPi75u8nCy4j+v690 rZ2zzIUwvcSoxCGd2B4U4wIhMAo58fkTgQkXivdjCPkLSD4Nb5F2f9iFNSoISjcOX/hC gESov+jEoGVAuEej+SBMdx1JlMRKuM4AknyBdOk9SZPLXf4oaqQAK0984T7soGuftFL2 yuKE/e4Ka4OcCu4S6hVECCssWj82sZP6YCxhatrMSREfA9NzMvw1iwsrTVPbnUmyVlR3 CnNA== X-Gm-Message-State: AN3rC/7IvGzRESk9JewF/uAml9y5QFvJ0zkNzxM4v4JfDuCNsSiS/N3F W9bSwNpSLXeg+w9s X-Received: by 10.28.143.71 with SMTP id r68mr878922wmd.61.1492220808939; Fri, 14 Apr 2017 18:46:48 -0700 (PDT) Received: from localhost.localdomain (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 3sm4459091wrv.33.2017.04.14.18.46.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Apr 2017 18:46:48 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Sat, 15 Apr 2017 03:46:14 +0200 Message-Id: <20170415014618.1592-3-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170415014618.1592-1-jdarnley@obe.tv> References: <20170415014618.1592-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 2/6] 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