From patchwork Thu Jul 9 14:53:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20915 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3C5B444B990 for ; Thu, 9 Jul 2020 17:59:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0760D68B375; Thu, 9 Jul 2020 17:59:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC14A687F1D for ; Thu, 9 Jul 2020 17:59:40 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id f2so937434plr.8 for ; Thu, 09 Jul 2020 07:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OKes569whygP1mAY6M3uoMWlwQkaVppKgUjJvMSpnQw=; b=qFjsPEs3qZoEIRGrMR1O20l2qSjpycSFYXeDmQAAS0goFp6AdrXoG23xbcHz4uksFN iBpuuTPo34JoRth6HNDGze85QM9dzFTCHORX7XT60t/kwNfE8pQJ+gXupS9LNRn2UVfa MWJqeL1iotRzwo5+CtP+fHjZ+Hv0kPBK1I9pR9cdabR/yW0zEvkrB6IHQmdpxHN0Q5yd r0t5UWSo3xFczQYmVW4YSNtoKFHc1/zBPQFC8wSzpsBSkHdJgt7cDcBPd9brsahlCNBQ Z+6KVglqzQoiUYN2lpPr3a4iqCeZ+QXyYpx3j3G2Nxd/YIdkLDpCHZcdZ1suLcpu0qH0 6zQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OKes569whygP1mAY6M3uoMWlwQkaVppKgUjJvMSpnQw=; b=IwEY20GAx/ydlvQ57jNBw9eOVNjs1csv72udvxc7swISB1qLLGMe0s0v3P192t9uQC BmyeO+HO3iGYBswP4OSb+t5cNoQfFoTp1cr0JJ4aKSUkzAgaxVND+3ZDPGaifMrr91UO xKEmlRK6KbO31yST0iairhR0Y3IE7GNFwnZd9uqd+55zlTRIkDQ095jwlf1gQongvpLG EAoFybPOKonNpgLJP8Y2C8HgfPKysB/LhA90oFriIxwSfMU46i0pQXQClRDXRo7Zrcuc +FZb9skhoZ93FaTmzVpFZgVUjEdpHvPUdpcJ0Vh/ablKE1iAxGFqyo1zczC874xuYpYy s3jw== X-Gm-Message-State: AOAM532oaxYFbkoA2iTYoY3BPk9ZPORSXHnQy9GiR3Z7dqj7ovJd7U4y a4Z8q8KcIluM+5dSujjPnOzflcp2 X-Google-Smtp-Source: ABdhPJwuOa68hUe4fHqvJEH53ra/+TqjKJOTDuNvQCgMwpWvybilPPgrOn1hxI4BB1k1cqkQnI6G4Q== X-Received: by 2002:a0c:f345:: with SMTP id e5mr50428846qvm.84.1594306428330; Thu, 09 Jul 2020 07:53:48 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.216]) by smtp.gmail.com with ESMTPSA id x13sm3697927qkx.10.2020.07.09.07.53.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:53:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 11:53:23 -0300 Message-Id: <20200709145325.7812-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/x86inc: fix warnings when assembling with Nasm 2.15 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Henrik Gramner Some new warnings regarding use of empty macro parameters has been added, so adjust some x86inc code to silence those Signed-off-by: James Almer --- libavutil/x86/x86inc.asm | 46 ++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 5044ee86f0..01c35e3a4b 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -411,16 +411,6 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14 %endif %endmacro -%macro DEFINE_ARGS_INTERNAL 3+ - %ifnum %2 - DEFINE_ARGS %3 - %elif %1 == 4 - DEFINE_ARGS %2 - %elif %1 > 4 - DEFINE_ARGS %2, %3 - %endif -%endmacro - %if WIN64 ; Windows x64 ;================================================= DECLARE_REG 0, rcx @@ -439,7 +429,7 @@ DECLARE_REG 12, R15, 104 DECLARE_REG 13, R12, 112 DECLARE_REG 14, R13, 120 -%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names... +%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names... %assign num_args %1 %assign regs_used %2 ASSERT regs_used >= num_args @@ -451,7 +441,15 @@ DECLARE_REG 14, R13, 120 WIN64_SPILL_XMM %3 %endif LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 - DEFINE_ARGS_INTERNAL %0, %4, %5 + %if %0 > 4 + %ifnum %4 + DEFINE_ARGS %5 + %else + DEFINE_ARGS %4, %5 + %endif + %elifnnum %4 + DEFINE_ARGS %4 + %endif %endmacro %macro WIN64_PUSH_XMM 0 @@ -547,7 +545,7 @@ DECLARE_REG 12, R15, 56 DECLARE_REG 13, R12, 64 DECLARE_REG 14, R13, 72 -%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names... +%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names... %assign num_args %1 %assign regs_used %2 %assign xmm_regs_used %3 @@ -557,7 +555,15 @@ DECLARE_REG 14, R13, 72 PUSH_IF_USED 9, 10, 11, 12, 13, 14 ALLOC_STACK %4 LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14 - DEFINE_ARGS_INTERNAL %0, %4, %5 + %if %0 > 4 + %ifnum %4 + DEFINE_ARGS %5 + %else + DEFINE_ARGS %4, %5 + %endif + %elifnnum %4 + DEFINE_ARGS %4 + %endif %endmacro %define has_epilogue regs_used > 9 || stack_size > 0 || vzeroupper_required @@ -598,7 +604,7 @@ DECLARE_REG 6, ebp, 28 DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 -%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names... +%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names... %assign num_args %1 %assign regs_used %2 ASSERT regs_used >= num_args @@ -613,7 +619,15 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 PUSH_IF_USED 3, 4, 5, 6 ALLOC_STACK %4 LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6 - DEFINE_ARGS_INTERNAL %0, %4, %5 + %if %0 > 4 + %ifnum %4 + DEFINE_ARGS %5 + %else + DEFINE_ARGS %4, %5 + %endif + %elifnnum %4 + DEFINE_ARGS %4 + %endif %endmacro %define has_epilogue regs_used > 3 || stack_size > 0 || vzeroupper_required