From patchwork Fri Jun 9 10:47:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 690895 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp746768wru; Fri, 9 Jun 2023 03:48:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4wLFcf2DXi1YrZaBdw4Pyecr/rAWMczjoRw4FObs9UA+Et2GuHSprdnqniL6+D4jWPzmm/ X-Received: by 2002:a05:622a:5ce:b0:3f7:ffb5:f551 with SMTP id d14-20020a05622a05ce00b003f7ffb5f551mr1260561qtb.37.1686307735890; Fri, 09 Jun 2023 03:48:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686307735; cv=none; d=google.com; s=arc-20160816; b=ddxYajW8lvZ268kis7tWICaxotAc4DSgKcVytbfHigZiEKIsdQi3B43C3XaoJ/exv6 hLLakp4+WMKcaKSIYmxsCWgiYWlYq175b/Y8n7GW8ffME8aKGkQUVrBm9hEhhn9pdIGV XP1CI/WlkdKNXZIs2Qpccw26joYzCSks1Iw+LBzQM++ylAEkwKJ3DkCN4g8FwpSX6oC3 VU08KiucfpPciTwuG4vsfmIw7S/zZbEdnMfmGoIRgonYwzcy3nwTwG7h/F1z9UZImdnG Lwk494+xPZrivBzsxoYMrg2IV+TyA1eyaiqiqjOFMojNhz8m86j+elgwPe0oGjNWEpcM KCfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uQVMFnSnRrSFcc+z/a3bT1hs0FZjoEq6vgTJcq2cEQg=; b=ERPMkFJenR7HmdL0/BdKxe3CIRcv+yWb6dGfMz7hWFmxR6W117RTkhNOTsvUAV7C+G Sr2rQF7aGXZ68z2QQFJaILcHDJTqkx4l1J6yoFj1VYRsu8nYZncBw82jGXawO/Q1Zaq3 Beg5DsKNfdwu4nxtGqHPtfXpjowfCIFdxwTPdgTzX3PkyQSOUwH/u69NrtWCmgMlN9G9 u3ZQHTFQhGT1rACd9mMcfXnAHxggnPGRatl703Mm9bn3FO0k4Dr6JW+L8RRDMkaGHrc0 /mA8zGbjES1gjcritHzVLi3YJCyHCw5qUtqKRR1wE2Fcl4GuxRsIhC7kc0UcVKamgyVs c+4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aIF4Vggr; 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=pass (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 g12-20020ac87d0c000000b003f215fdcda3si1984554qtb.721.2023.06.09.03.48.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Jun 2023 03:48:55 -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=pass header.i=@linaro.org header.s=google header.b=aIF4Vggr; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7ZfW-0002MD-80; Fri, 09 Jun 2023 06:48:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7ZfN-00022V-79 for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:48:26 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7ZfJ-0001UK-LR for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:48:23 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f629ccb8ebso1966772e87.1 for ; Fri, 09 Jun 2023 03:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686307700; x=1688899700; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uQVMFnSnRrSFcc+z/a3bT1hs0FZjoEq6vgTJcq2cEQg=; b=aIF4Vggr0VNHn+dp5UpfCOe0Nk/9qT7lHn/Jr1jmqrDzC671Onhs2c/GiHvVw7LZ+W U4lFiIdaPFXd7mvgkO3ltqmlqMSwX7n6TExOwNQ6ctzu5+Oq2lSBBeb4jMe7cVO+KlG2 1BpiigsBkfKrn3c4tfEb/0cVwrSmDapC9zq1yMU4mU0gaPEN5rK35qUMkpMmAh3DHRco qbRlBJubda7JxEe8Z4tBZZQzznqq9pDTb1vqd2kgOWPah83aPwMldASgvID7uNKEs9mz nNWcVsaV0juxJ7MzAyf2c99MTgA6WAhg77rCEJeT1sdiRpDXeg4Iuo4OYf6fIZXs0osQ Oxaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686307700; x=1688899700; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uQVMFnSnRrSFcc+z/a3bT1hs0FZjoEq6vgTJcq2cEQg=; b=VnCYGDaVfo7Qn1Z8xPsKK/ve/kpU6jDNjqO/W2fBhBigGVjmBiHN/5uRuZle3e4XQY tp/h7w5+SzhVhdSiSv6FaUla1eB/7wUFDVIif50YTWcilan5JfBbXV/Aqe1D+VWRPG9/ AEGwNVvLtZQZlt9Ht/EgW29LLsuBFkms+x57w5rknkJKmn+qf9c00O4I5CRsFdj+e1xi sRK7P0DB6NjVHuT2hWK6h/Cper8K9EorLzjmxkHr1Ecpm5qgt4IPZIeNOlfZjheEz4bJ XmVFyiNsBI7MO7zcLVJONIMCsyHoH85SG91uGvvzqKvgWyWs9AaDdPHihayHzoJ9xJqY AWLg== X-Gm-Message-State: AC+VfDz/plsNMgkJHxUBveJoqLHaaFsOfpCH0yTlqc7YGv76YKLgHrtT IJ5oturWYFqGCaD52rTbY/eapD0fNSosfPlRpYkg5A== X-Received: by 2002:a19:674d:0:b0:4f6:43cc:5857 with SMTP id e13-20020a19674d000000b004f643cc5857mr643148lfj.19.1686307699785; Fri, 09 Jun 2023 03:48:19 -0700 (PDT) Received: from localhost.localdomain (23.171.88.92.rev.sfr.net. [92.88.171.23]) by smtp.gmail.com with ESMTPSA id p7-20020a05600c204700b003f7a562ff31sm2325064wmg.6.2023.06.09.03.48.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 Jun 2023 03:48:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 09/22] target/arm/tcg: Reduce 'helper-iwmmxt.h.inc' inclusion Date: Fri, 9 Jun 2023 12:47:04 +0200 Message-Id: <20230609104717.95555-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230609104717.95555-1-philmd@linaro.org> References: <20230609104717.95555-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=philmd@linaro.org; helo=mail-lf1-x12e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Instead of including helper-iwmmxt.h.inc via helper.h which is included by all TCG files, restrict it to the few files that require it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/helper.h | 1 - target/arm/tcg/iwmmxt_helper.c | 6 +++++- target/arm/tcg/translate-iwmmxt.c | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index c4a321c0ea..dd12fee107 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -949,5 +949,4 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, #include "tcg/helper-sme.h.inc" #endif -#include "tcg/helper-iwmmxt.h.inc" #include "tcg/helper-mve.h.inc" diff --git a/target/arm/tcg/iwmmxt_helper.c b/target/arm/tcg/iwmmxt_helper.c index 610b1b2103..fa84b5f672 100644 --- a/target/arm/tcg/iwmmxt_helper.c +++ b/target/arm/tcg/iwmmxt_helper.c @@ -22,7 +22,11 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" + +#define HELPER_H "tcg/helper-iwmmxt.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H /* iwMMXt macros extracted from GNU gdb. */ diff --git a/target/arm/tcg/translate-iwmmxt.c b/target/arm/tcg/translate-iwmmxt.c index a054064c98..d241f64835 100644 --- a/target/arm/tcg/translate-iwmmxt.c +++ b/target/arm/tcg/translate-iwmmxt.c @@ -21,6 +21,12 @@ #include "translate.h" #include "translate-a32.h" +#define HELPER_H "tcg/helper-iwmmxt.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#include "exec/helper-info.c.inc" +#undef HELPER_H + #define ARM_CP_RW_BIT (1 << 20) static inline void iwmmxt_load_reg(TCGv_i64 var, int reg)