From patchwork Mon Oct 30 13:08:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 5761 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2677780jah; Mon, 30 Oct 2017 06:17:01 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RXOIim6mVagsgLXW/aT+pbCEfHHcvGP41xzcX7yWK2at4c7mLCAr1evGqABHwr+OT7zrZj X-Received: by 10.223.143.51 with SMTP id p48mr7139995wrb.104.1509369421118; Mon, 30 Oct 2017 06:17:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509369421; cv=none; d=google.com; s=arc-20160816; b=upIqHJAxU5/7wTXWRHzOthCYEycrHESGH6jyJVDKRcP2muCaoGySz9xoFwE6mnmeMf 74HcCgDfeEK+OXsHt7VaafYlaABpLvGvSTTt592CeAwrrr/QEwAe0jpdr6KOHdQirc/7 qbV81cMuJ4+O1VzH0ucA6B9+mw8EeGvsFHXn7Plp/iMm0X3hSzneo8wzIwN8igrL53kV 7axj3fUdkTdrE9IvoYovbydwq5i5SAMqDxvAQrO6yVPNI4m5IOju4amZlOvbwVGnlArz bITvvtsWHLYifER3Lp8HsHZBtRZ6PCllX07uuBsMGQPvxjHwotm1AiSDDIX3uX9Lmfl6 uNrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=v2m5aCFWZv9/DYUjDSgw3M7zfZv3tJE0Icc1cSYNugQ=; b=N23uCHnUaqd42w0CZsDCHo8feeDJcXlU7ochsXU6flwHKD/M75IEQzuC2GD4GpiWiI WEGFboN00kBR6m/6EK0sb+UQEzruMpwWER3u8J2+rsQ30JGVHk8U4uT8ZIDKRf0vXeoL fOWD0J/TBVs0CCj7dj+mgIVqRyu3MBROS7fuv/IJZj60B+1hHpmbVzlWVgkKEVVIEPsr LeJzH8GURHzOach+19tVQLQd1CR+FEyQbqoR4B9YuBh3yI4AxAHrymeq/Cedw5XsxZ5c iww5h6Q6JPRu+R7aIupZNfen+4xeguyJEvvOUnHt/tPstjiYr+xE+r/l/6I1Y6hv2Fz6 JuiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=opBpCOpp; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q204si2984103wme.11.2017.10.30.06.17.00; Mon, 30 Oct 2017 06:17:01 -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 header.s=20150623 header.b=opBpCOpp; 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 7AF6268A075; Mon, 30 Oct 2017 15:16:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C177F68A06F for ; Mon, 30 Oct 2017 15:16:43 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id y83so16283416wmc.4 for ; Mon, 30 Oct 2017 06:16:53 -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=mUb95rEG0tZ/GlxXV5g2Uyu7qn+iqrdqoJwFsoa2gGM=; b=opBpCOppEC8pFgMuVD2jcQ+b6We3dZzNgfPiiaUWWuQY61A6bKml2OAD7Y9uHTxsH9 02KqiJF5gCcuIayIxKX96m1tOBHM+L/YdXHZK4O2zNreVk2ANENC3lZYbXMCOdK3aE3Y 3AffjNQdn8R4Vn6Sebg4D+zoTi32oOaEikZYPgctIokKDNhJs0IERxJNECOxZBfMuUPj klu6xFpyu+Ne0amkSFEHhLoH6nACazObt1tuoUHTF/7LojMy9LZj8luuKp5gF1b0Ayb8 o+SI9GkOmogHaHAq8YdATLNNq0m2qg0W43EllYbapGLz8CwCpKku6bq3/IPabyEMbyVu EElg== 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=mUb95rEG0tZ/GlxXV5g2Uyu7qn+iqrdqoJwFsoa2gGM=; b=YhweB+Q+E2tBpR7zc7E8WIdhfQFxmctMQr1egBNkYWouZ9/wA/av4o34a7wOrXJrHs EoKmirbfiPw3RhgmeLVn4hZJ9Bod1LiZtkU6Z2KyF7m2Fbv0qbxKu+DVu3Dvnw5JhJRM ZmSVspIcLEuJe/OnQzUbyUj3mC6BNNJIK6ANwxaNMLdII9+1wyrmq3vHLDaG1yYGpvt6 uPsf5zCm/9fug3WQsd8kYgBXvl8ND3ee1WbZV8fFsfafqZx7vWf1XS5gAkn3R/VoSqsK chjjzTbU5Ue5VOC2UATokiP4yM/aBQGDoqHNxed8biTYIU7R410lHmhCZpPb686Cke/K nC+Q== X-Gm-Message-State: AMCzsaWZlHXH+VsvlrezXqaZE800Pc98PrONf51eg7scJUvs/PZyqE3J U6DF8YJaWrhbjBWW5vPSDJKeFw6b X-Received: by 10.80.177.193 with SMTP id n1mr12395103edd.30.1509368924796; Mon, 30 Oct 2017 06:08:44 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id c5sm12176842edd.38.2017.10.30.06.08.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Oct 2017 06:08:44 -0700 (PDT) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Oct 2017 14:08:33 +0100 Message-Id: <20171030130835.28327-7-jdarnley@obe.tv> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171030130835.28327-1-jdarnley@obe.tv> References: <20171030130835.28327-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 6/8] x86inc: reduce difference to x264 upstream 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" These changes were commited to x264 in b568a256 "Experimental nasm support" --- libavutil/x86/x86inc.asm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index f3dd2b788a..10e4603a65 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -113,6 +113,10 @@ %endif %endmacro +%ifdef __NASM_VER__ + %use smartalign +%endif + ; Macros to eliminate most code duplication between x86_32 and x86_64: ; Currently this works only for leaf functions which load all their arguments ; into registers at the start, and make no other use of the stack. Luckily that @@ -857,9 +861,17 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, %endif %if ARCH_X86_64 || cpuflag(sse2) - CPUNOP amdnop + %ifdef __NASM_VER__ + ALIGNMODE p6 + %else + CPU amdnop + %endif %else - CPUNOP basicnop + %ifdef __NASM_VER__ + ALIGNMODE nop + %else + CPU basicnop + %endif %endif %endmacro