From patchwork Fri Aug 9 15:41:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 170949 Delivered-To: patch@linaro.org Received: by 2002:ac9:2daa:0:0:0:0:0 with SMTP id g42csp9651610oce; Fri, 9 Aug 2019 08:42:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKehK8GYD6Db/ZCbOPsKvtTKbEI+966QqBtFczx0OcX1GOWphO+NfPyGirri8UIJCKpLPZ X-Received: by 2002:a50:fb15:: with SMTP id d21mr3546006edq.127.1565365337294; Fri, 09 Aug 2019 08:42:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565365337; cv=none; d=google.com; s=arc-20160816; b=zbrdh9Jdxd0/LtY4Zg/nYG0BMwWSSEIA823J1hFGgXqCS4NbcmB+Gdv3QPBonmDGM/ ex1wRa7H/J/wC4nvdf2wh8liS+cFm26NIL05uiixvXutLiOluZvZxhfnIbbi4B3VDryn qVG0bt7WVpxTer1AP+G82H9TFX9foV4kPbwhIeVErtc8eEeLct+o5lp5Cp45gZNvWpe2 KqpuVBX4H1gxu9SFF59pGFrxRAwHrcOrfzvNDb7+DN4Yjf1fYUXu/60g7rBgAJavY3YP ELfuMCK9Gaoqv5Kq+BD6anj+15AeNbWchr054IfDnL0JaG/tnZxiuIbw9Tr9E36CG9BZ dcYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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; bh=leHpSxHzVUfQCq35SXdIhrfSJv5bGUxlfMEN59fKGs8=; b=AMzC99aJM6HiJNYQHUqY2jFLoCwO4D59lkJuUUYo3rWpUiASlodv4jSrz+alK41Yno uQzfWDX1Ja9OPPyvVIAhvHK5xJfdOf+VV8kU6G9BoUqvzN1aScgg93fApQsg9aoZCOJj DSMljjsEmXcZ1AHjk1Ma7F1vHyXg7MWJLs4RO65nsu81uNjjc9XfayHFZG301I2Iz3no mvAtEJJncQ/EsLvX2H43+GTmXkkRzOdtxn1tu2pf+4h7NB/i7Hoy8+OItjYFU/GF33kX 6Yd6gFf1MucTAQ7G+RdCJAWierVSyt9KiPQm1BdBUdfnSvSBIgUF1kTBBvELKNF/Z1wL Nq5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R+x9JWNG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i24si36768983edg.100.2019.08.09.08.42.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Aug 2019 08:42:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R+x9JWNG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw720-0000nf-9o for patch@linaro.org; Fri, 09 Aug 2019 11:42:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50813) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw71p-0000eR-5y for qemu-devel@nongnu.org; Fri, 09 Aug 2019 11:42:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hw71n-0008Ur-Lj for qemu-devel@nongnu.org; Fri, 09 Aug 2019 11:42:05 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:42660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hw71l-0008RA-LP for qemu-devel@nongnu.org; Fri, 09 Aug 2019 11:42:03 -0400 Received: by mail-pl1-x644.google.com with SMTP id ay6so45162176plb.9 for ; Fri, 09 Aug 2019 08:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=leHpSxHzVUfQCq35SXdIhrfSJv5bGUxlfMEN59fKGs8=; b=R+x9JWNGRCUyPT9qY3gVRkx/94Jp2YtcuNACFzBuhhxhqF95so80+Jb8LzC7mqvsLE PC1JIijvAdAWGOxKse6YwXT0dF8oVgKkcY4NyvZYiY9uV7qkFrkRJh6qZcs7DHqC/Hrw DZohBIcvGacA/E0rBf7QTEmwaq9UQlQEF7IYM/eUVmlgtqPtgnV2gPIu+UZsGPtIQ3HT +iZ27v7taX0V46y2bXnJWuseXxxFPGoozjGC3faiJmbLMWbH9eGtJ6tMM1X2qCp2ii7x +AWyzWzDTHpxRPIEDUXvlKn5rPoOeMXZeDR332BiSIOBsgiC2Y4k3d862xbmCtgufaJk clnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=leHpSxHzVUfQCq35SXdIhrfSJv5bGUxlfMEN59fKGs8=; b=XACmY2iLAFVN/3uIEf8A7vIXA4zTlWCtRy3BP/e8mBWf7AtV2vPM9+7UUF8wAwsJ1l ULOE5n5KZooI4mll3UW+Tcb8EQ5fgApV2E5K23edVbVQv+/Dc/jYprJ2qiyboMAslb63 4tfJ0uEjnyCR6naaY6CNXqtCnFWPTnzxYDHjt+prUSjtwIbn9sJ+9Ph1+k3cfvOXHa4n B38AEkfRdlP0/TJ8w6XrypVKUOTGHm7GOXga+dOkifUd2umm1SzmYeR3epHCjn/9pkf3 6xv/zZPwCF2FaX7Fj9yT6FGsd5LWUzxN3aSGKgsxy1XjHWcG070bJZxpl1qGUpPjRZcw 2PqQ== X-Gm-Message-State: APjAAAWp9oP7yaL16o5vrlTWsd26P8ULuwLNKHkV1UgJgHNsoS1uhcRM Q6jxaAfZaM3fgDFZGW79qVYl0OW0bgI= X-Received: by 2002:a17:902:7d86:: with SMTP id a6mr19609862plm.199.1565365318747; Fri, 09 Aug 2019 08:41:58 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id 67sm80452179pfd.177.2019.08.09.08.41.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 08:41:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 9 Aug 2019 08:41:52 -0700 Message-Id: <20190809154153.31763-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190809154153.31763-1-richard.henderson@linaro.org> References: <20190809154153.31763-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::644 Subject: [Qemu-devel] [PATCH 2/3] decodetree: Suppress redundant declaration warnings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Alistair.Francis@wdc.com, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can tell that a decodetree input file is "secondary" when it uses an argument set marked "!extern". This indicates that at least one of the insn translation functions will have already been declared by the "primary" input file, but given only the secondary we cannot tell which. Avoid redundant declaration warnings by suppressing them with pragmas. Signed-off-by: Richard Henderson --- scripts/decodetree.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis diff --git a/scripts/decodetree.py b/scripts/decodetree.py index a2490aeb74..f02c8acca1 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -33,6 +33,7 @@ arguments = {} formats = {} patterns = [] allpatterns = [] +anyextern = False translate_prefix = 'trans' translate_scope = 'static ' @@ -485,12 +486,14 @@ def parse_arguments(lineno, name, toks): """Parse one argument set from TOKS at LINENO""" global arguments global re_ident + global anyextern flds = [] extern = False for t in toks: if re_fullmatch('!extern', t): extern = True + anyextern = True continue if not re_fullmatch(re_ident, t): error(lineno, 'invalid argument set token "{0}"'.format(t)) @@ -1191,6 +1194,7 @@ def main(): global insnmask global decode_function global variablewidth + global anyextern decode_scope = 'static ' @@ -1251,6 +1255,19 @@ def main(): # A single translate function can be invoked for different patterns. # Make sure that the argument sets are the same, and declare the # function only once. + # + # If we're sharing formats, we're likely also sharing trans_* functions, + # but we can't tell which ones. Prevent issues from the compiler by + # suppressing redundant declaration warnings. + if anyextern: + output("#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE\n", + "# pragma GCC diagnostic push\n", + "# pragma GCC diagnostic ignored \"-Wredundant-decls\"\n", + "# ifdef __clang__\n" + "# pragma GCC diagnostic ignored \"-Wtypedef-redefinition\"\n", + "# endif\n", + "#endif\n\n") + out_pats = {} for i in allpatterns: if i.name in out_pats: @@ -1262,6 +1279,11 @@ def main(): out_pats[i.name] = i output('\n') + if anyextern: + output("#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE\n", + "# pragma GCC diagnostic pop\n", + "#endif\n\n") + for n in sorted(formats.keys()): f = formats[n] f.output_extract()