From patchwork Thu Jun 8 23:04:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3879 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp3083873vsk; Thu, 8 Jun 2017 16:13:13 -0700 (PDT) X-Received: by 10.223.181.132 with SMTP id c4mr12966904wre.167.1496963593296; Thu, 08 Jun 2017 16:13:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496963593; cv=none; d=google.com; s=arc-20160816; b=HOdFkVlrjd2DhI45K1op76KMS4Z6uV14unhLO6okwX2IAHV8kkmyOoAZAvplFgTBRY DPjiDIa1C5paUQuw4hfv93eNXqjHNUtpuYdfX3XiMx8qbV5UuToANrI9sdTU6ThqiCHo aJ1u4CrWWXMVs96pjTN+K+46mVk7hRuovlbBHhpAEnR58EBMtzL8hzGUS+cw8VOQDMkq D8dJ4Opn5BE3TPW426CoVRnAjdhTkH4LBkryUfnlYWEnKpWYnU4BLBvuIEowEwsn4959 tT1FzUy/9QxYwgMzevZAgqJwIzBI2G1oneESvems0Ds9A94+FGyqr8KIInuJVtqMo8Sm WjLg== 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:cc: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=CBW2fJ7OtmVjctHbkrUkIX1T9hwQcM/Af+yEjcOus+k=; b=i9DELyFKIsdnja3czZzJaP0Gq8go6BuU/rW2wb2zyNeP/QmTXeVPsGxo0dfJx4Cm1Q IQuwI6z4KD5iMALthhZM20p5bIf6CIEyzBBaU8VBmaI5mKAMjhoPzThqv7rh0BUTmD7s vQ4lPHToSTRNQt75UAGpSWDhFu7p921VBXHfq/0ux1M2GcefoV/yqadwNRdGJSIhTiYC +e7QduKglHKiGfF3Shql/bB20hfjtD9vIADPScY8WozABhJiyIXG94yWQEpKfQOiuyr8 V6rQ70U5j0XieVl4pUKvGcG6liUaF3QH+cO6zFrGJyv17S9cRM3idpEnTlbjeDF353n2 sNrQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 200si121068wmw.0.2017.06.08.16.13.12; Thu, 08 Jun 2017 16:13:13 -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 66F6A689C89; Fri, 9 Jun 2017 02:13:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41E536882F3 for ; Fri, 9 Jun 2017 02:13:04 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id u101so5009125wrc.1 for ; Thu, 08 Jun 2017 16:13:04 -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:cc:subject:date:message-id:in-reply-to:references; bh=GLZHLt187veaWdUErL/+kp6f8afHY9wy0cZKeLsZZMA=; b=uKgoCpurkvw8xvECdUrUkyGYBLXNEZ8WYpS5q3TZrXu6km94Q6lRTNdFbjnScpMd5R DHZs14UQu5BMUoRFh3ewqEbgEq8eElkTyiYvC9UBLtRB1LxZTHwhXZgQb/bNRdITUkE/ fRcE9Hzic49U/03hMUf4bdLSvTVa9nJNEFtR0uI8ww08LThupv+umoRm4pS/ETuvBumj PxUkLI14+/5gXtHQga8buqckd552e6yORH97WFURwxdqGwIVqyGrs45zVc70bqKqSFHP gWYHt5DMXq78N3XjcI9MOz4KLiZFw7WcWeRPWRPMLmKlY0bSVON7oxfnHF0LGpe8Xmp2 9rkQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=GLZHLt187veaWdUErL/+kp6f8afHY9wy0cZKeLsZZMA=; b=rrxxwtjiSypVQxBldpGhFlPF/FnclowpNWgAL/1VktNZbrx6cN47r05X6e1CGwJ4kc RMeRlPx1k/isoUNoi74tmgm6zuFRZ/0oRJvx2a2hw9Iq1xoPZFwHTFr8I3uW7+T1sZ1M XacEM9BoXF27jKwvqAZxPZm2dF2bnKSOp/TQPg11h3z6afI9nEJ136ilFk8266rw8FIe QsU1ErKeE7ume6RD0bTnm/w4x9Tv0xASujPYQD2/wVU189gxAqCXKgeL/k0MdWiBMBQO yR10XvA4LsUJe3kN/tdSN5d5H76epdlLbhqh2xw/q1yOy+KpMycWH31a3j2E8Zr7slgX lnaQ== X-Gm-Message-State: AODbwcDz1lwNhPBN9aWRu90Kp869tCQkGiuMTAm12xBeeG/mYtR/SJp3 iE5kxa+PcbryBVZr3M8= X-Received: by 10.223.153.166 with SMTP id y35mr26727276wrb.41.1496963163439; Thu, 08 Jun 2017 16:06:03 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id v62sm82057wmv.15.2017.06.08.16.06.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 16:06:03 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Fri, 9 Jun 2017 01:04:58 +0200 Message-Id: <20170608230502.29258-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170608230502.29258-1-jdarnley@obe.tv> References: <20170608230502.29258-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 1/5] x86inc: Fix call with memory operands 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 Cc: Henrik Gramner MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Henrik Gramner We overload the `call` instruction with a macro, but it would misbehave when the macro argument wasn't a valid identifier. Fix it by explicitly checking if the argument is an identifier. --- libavutil/x86/x86inc.asm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 128ddc1089..f2a6a3f1db 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1037,7 +1037,11 @@ INIT_XMM ; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't %macro call 1 - call_internal %1 %+ SUFFIX, %1 + %ifid %1 + call_internal %1 %+ SUFFIX, %1 + %else + call %1 + %endif %endmacro %macro call_internal 2 %xdefine %%i %2