From patchwork Sun Jun 11 08:58:29 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: 691362 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1572627wru; Sun, 11 Jun 2023 02:05:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mKx6Ob6NdmY6Uv4f9gJLF9j9RzQ0iX1T53lyKxS3LkFMN5nRRN8lVJ/we4ZExBJyH7ui6 X-Received: by 2002:a05:620a:8fca:b0:75f:5b10:6743 with SMTP id rj10-20020a05620a8fca00b0075f5b106743mr2949707qkn.35.1686474358379; Sun, 11 Jun 2023 02:05:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686474358; cv=none; d=google.com; s=arc-20160816; b=ZoLTu0c/fcm2hG6R/g9oIJRMw2DYRDS8nd/YK4w9c8wz3qops2/lP4Ybdahgxa+zbW +h/JeXG8W5nCTo217bdMO3Mms0ib20/kvucm/31mymLqpLg+/e9t5TPp7hdTNLBPBEwx +3LN9QmVkAbYBikQnDObYolLLZZH7zX/nFSigYGCaBI3qCflIylZ14rRxeLiUCTiU7Pr Sr86cVrBcSlkgbi4OErlgaMucfYxPbNaeS2uU1w4EGShezOwrcVIy5VgIIarYFQT0QxB 9FzLGkIpiSYfIDJCJrWXDI4GndiDyc/YTD/BpCkjkZ6T1viQkJI7jBb9dhUAOaX9DyAQ Cu1A== 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=jPnCvSZ0LTnP+mwyCnVM/2nlrxmNit9JdtgjWZL7/t4=; b=E/M4WQeipwMDnowecyfCPVUQq8dmFFVsVlv/wyNzgV8oYonPX5JL/9p+10mwFdvmtz jgCDo2KVkLt08Cv2frRCxJffWQPEEobhzEzA9TgP227OZQKj8n6KOOga2jbVrSaFka5g PIybNzg4wdHWOtDGeiq+iultdhfe2HnJ7wFfuhSYcxKJn2rgIfzQZ0+0V5eoAUZWCJld J6Pxs22iB1UWc+DR2SSSadsGDYNAcBtRM/L37HcXsiN/L69PIc7kpNHoz8Wz4AH45LKJ iv1zBeVR1iFRhXiIUG/Sl8sd1KdVP3vl2p3bdLGuS2uKwkeEifqRRfnrD6kXXzy2FkJO XlVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lfGxV1Ki; 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 16-20020a05620a071000b0075f02358c9dsi2541830qkc.544.2023.06.11.02.05.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Jun 2023 02:05:58 -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=lfGxV1Ki; 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 1q8Gv7-0001cj-61; Sun, 11 Jun 2023 04:59:33 -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 1q8Gv4-0001Up-TZ for qemu-devel@nongnu.org; Sun, 11 Jun 2023 04:59:30 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8Gv2-0003a3-Ql for qemu-devel@nongnu.org; Sun, 11 Jun 2023 04:59:30 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f6da07ff00so33873935e9.3 for ; Sun, 11 Jun 2023 01:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686473967; x=1689065967; 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=jPnCvSZ0LTnP+mwyCnVM/2nlrxmNit9JdtgjWZL7/t4=; b=lfGxV1Ki566549IaAA8d17ENQY4Dm9s/xfwMlcTMXHWycuhGkqRcZw/0wjxHE8I21k KvgCnLB0t0hHPkjLBt6ZJVvzchW1d1ELvChP021VkjbqmbKyQcP+3ISKEgofNd/RMxWe FprnTmIJjy/gowU1Kz0zq+SpyjKUsWyRDkQxnnmpxgCsmqemnguKVoMiZlaGX1u5g87B cr5NKYagDZgggiQZrZm9hV+oT28SuW23sBaZ/Koka4vHsKiOL9xQXcHhsjrnm+JE2fSb EBom5Luw95/YTxGbQm0uLIKe6pVEwvcAlsPK6zqy4La9voBNRWz96UQTbwBrpzv1pVho Ic3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686473967; x=1689065967; 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=jPnCvSZ0LTnP+mwyCnVM/2nlrxmNit9JdtgjWZL7/t4=; b=hov7PISaIq62QFnNLkY3x4rzlj3Lvx1Z0uxzUMSj8Rfsf14rBTLfu9FYH8VQYZkP+6 m0BK2gzMLUPL9Mo6UBMd3rBQ5MW+yyuzaL61npaNNOwnyn8TKuzFhF2CrHkk5MAHn0AS VuSPbnIho4tSpsyI4Wj8bIPewxfoEu5TfC4mFuYJFCNtMosoogIB/2NYqUNmoZ/Cs27L WEvPssVRpRm2tl43TL7ZR+TNXzQUo3wO6+mnqgiFIzvu1E2NPYKgvDVG+Dqyg2RfYoTj L+MH+BlQmoMsXkrer1M5j7A89aXE5Q4FvNSIrxGM9FWSW1GWciXII2KdWnUZgmnhqvTI Nhxg== X-Gm-Message-State: AC+VfDzsiiCk1JbmSV/RhLYXHolFAa42xghMaKZt4abcsDRD/1ZWfbfN 1Bh9CQ1vuKpVDZSBxlATrg0XoBnPYB/waaUxktY= X-Received: by 2002:a05:600c:2297:b0:3f7:f544:4993 with SMTP id 23-20020a05600c229700b003f7f5444993mr5236269wmf.20.1686473967732; Sun, 11 Jun 2023 01:59:27 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id f10-20020adff8ca000000b0030fae7129e7sm3791910wrq.42.2023.06.11.01.59.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 11 Jun 2023 01:59:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/26] target/arm/tcg: Reduce 'helper-iwmmxt.h.inc' inclusion Date: Sun, 11 Jun 2023 10:58:29 +0200 Message-Id: <20230611085846.21415-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230611085846.21415-1-philmd@linaro.org> References: <20230611085846.21415-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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=ham 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. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/arm/helper.h | 1 - target/arm/tcg/iwmmxt_helper.c | 5 ++++- target/arm/tcg/translate-iwmmxt.c | 6 ++++++ 3 files changed, 10 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..ee607a3d3d 100644 --- a/target/arm/tcg/iwmmxt_helper.c +++ b/target/arm/tcg/iwmmxt_helper.c @@ -22,7 +22,10 @@ #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" +#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 57a924c578..9f6d717ee0 100644 --- a/target/arm/tcg/translate-iwmmxt.c +++ b/target/arm/tcg/translate-iwmmxt.c @@ -12,6 +12,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)