From patchwork Sun Jun 11 08:58:45 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: 691363 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1572693wru; Sun, 11 Jun 2023 02:06:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6eXhIoYPFmgUboJOiKOkChwdr1CQMJSFSreKco2QNYErRpSmwZe+J1SmMoSE3jTG07ptDD X-Received: by 2002:a05:6214:2aae:b0:5ef:a772:2731 with SMTP id js14-20020a0562142aae00b005efa7722731mr8032314qvb.11.1686474376731; Sun, 11 Jun 2023 02:06:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686474376; cv=none; d=google.com; s=arc-20160816; b=XqRFrLOEOAi/wxYQg1C3nJwxngrDB4O8wKMVhPWdiJuEXY3bf0u/PoSuCKbJPdaJNv oR3XsNxDSmW5EJyi/NGKSB1+Oyc7fF1WmBFRO4b6oZZGNuEFh2i+8OMAfs0WHCi7pfaF P1ddZgkxWPyTuZ5uEAdKquJ2NGnp/nnu3elARq3pMBCTqc9TSHzeVP4orA08FInCpupp A3k56QHRhuRaUcynD2/+LveOm+WOLNmcEh2ExavoGqngIuCLvXgb09Jk/Ay+n2uu+FiR AdMUB6xNpAmw4hzDPidYBu3s/M7OJdTjVq8hbNPZ/42FS+OJMCroEnazlsYI9u9xf/35 bAfQ== 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=3c5LLgM8zqCm+VTMgGqUz6vtedxBGV45kgOdre73KRM=; b=AFnkBgjnUiSvy0cgZAMC/op7Fq8o8ayUDVwELtWmSuJaJwfha9D9yJDosdKxfSpzsE t4X16LYiWe8UOFFlg8U2PhIRsKaQQxtxU2t3HoUYavQdGuRL+p9Yunwl76BLOmteM61B b+i0DTOX4f/AgnTqsvaCK2cUOeq9qeV1JNKwKVke0t2yu8gJyLaS2Iiyujiiy4Hw051U 5kQzBrSnGHQQ0nivInFyco1o+/ma4vSHgRClBL2ReaCgGBd4qU151joN39JfbEBjEKSh 3SHeRMVDh8vZZvQQ3XiPaW/CcRV0IemD+V1uP8R1xsHHS7odlpcSgJrpSi+srWw2qbVk C6iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tv7At1gm; 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 5-20020a0562140cc500b00626009daf30si4800243qvx.537.2023.06.11.02.06.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Jun 2023 02:06:16 -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=Tv7At1gm; 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 1q8Gxp-0006RA-TU; Sun, 11 Jun 2023 05:02:22 -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 1q8GwJ-0003Rr-EM for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:57 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8Gw9-00048k-QU for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:42 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-30adc51b65cso2978156f8f.0 for ; Sun, 11 Jun 2023 02:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686474036; x=1689066036; 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=3c5LLgM8zqCm+VTMgGqUz6vtedxBGV45kgOdre73KRM=; b=Tv7At1gmt7VmV/BILMQQibm6etqqfIHfsQNL8jOqLkgVeMYpjdHmOqqESbyWFSxie8 pFV39qhZzQOvE4XdyBAokoIv35DlGiOxl5zraIgLguvKxHKOefeYjwDTNvbJxB29d8IE pj9Mhcs2a8ol/JlqzUyUYOg7onC+cRnFub0Io6FN7E27pKD9W+d5uuraWuOyGkj9an5f CJPND+lcOMjLsM6AQVDweOsy43w7+9LKyMp1C5g6qFvzQGoJBHL+5+zxkNvxBGCGo+2A dhm3+pnZNoGlfU4c0E7trdjHpa74u6rOc1fZRU2hIdFWHDBbTR8UCHKwvpflZRpmFR4Z DUiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686474036; x=1689066036; 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=3c5LLgM8zqCm+VTMgGqUz6vtedxBGV45kgOdre73KRM=; b=aAb7rOhbUZYymFd6PZ5ORirZw6sQVwHBUIL2Q7Ru0FzvQ6vjz0mIoWaKdrEZ8iElT8 ezzmRmMhqkXWi7lXoMukcMm64xg4KTgpAgzYLV4N3/sBjas4LJPYHHaHgzvwIUa9qZNg Vd2SIvBiiHEnY/thZSzyJZuOy4VZiX39fOR3n5orJofZhVH7YfqD3Dx64FzbMxe6VOdG u3ZGxibJ7CV6hZZOZzbHT49KpOOwoYppRQnJzdBOKeRvlkWIbM2lAjNOKVPIL6V0HVPI U2SlNh9VfFrR4bW5LV2lzoRIOzgmelxejB8zBUmwMXtQkGgWKvtefSs/3nBNTOEbjROp OkAw== X-Gm-Message-State: AC+VfDw795LjjjVeNp5NogUB4mfX3FrCZVTu1U6LahUF0K7MBKf0JO6f 3qJzCIQmKpRAashYsj+5MxE9nNJudNWWekRKSc4= X-Received: by 2002:a5d:5543:0:b0:304:b967:956f with SMTP id g3-20020a5d5543000000b00304b967956fmr2723982wrw.8.1686474036139; Sun, 11 Jun 2023 02:00:36 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id e7-20020a056000120700b0030af8da022dsm9093350wrx.44.2023.06.11.02.00.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 11 Jun 2023 02:00:35 -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 25/26] target/arm/tcg: Rename 'helper.h' -> 'tcg/helper.h.inc' Date: Sun, 11 Jun 2023 10:58:45 +0200 Message-Id: <20230611085846.21415-26-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 Since commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented as the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Therefore rename 'helper.h' as 'helper.h.inc'. Since this file is TCG-specific, move it to the tcg/ directory. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/tcg/translate.h | 2 +- target/arm/{helper.h => tcg/helper.h.inc} | 0 target/arm/debug_helper.c | 2 +- target/arm/helper.c | 2 +- target/arm/tcg/crypto_helper.c | 2 +- target/arm/tcg/helper-a64.c | 2 +- target/arm/tcg/hflags.c | 2 +- target/arm/tcg/m_helper.c | 2 +- target/arm/tcg/op_helper.c | 2 +- target/arm/tcg/psci.c | 2 +- target/arm/tcg/tlb_helper.c | 2 +- target/arm/tcg/translate.c | 2 +- target/arm/tcg/vec_helper.c | 2 +- target/arm/vfp_helper.c | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename target/arm/{helper.h => tcg/helper.h.inc} (100%) diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index fc6357eae8..940347b6bd 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -8,7 +8,7 @@ #include "exec/translator.h" #include "internals.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-gen.h.inc" #undef HELPER_H diff --git a/target/arm/helper.h b/target/arm/tcg/helper.h.inc similarity index 100% rename from target/arm/helper.h rename to target/arm/tcg/helper.h.inc diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 31165b92a5..b32852e947 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -15,7 +15,7 @@ #ifdef CONFIG_TCG -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/helper.c b/target/arm/helper.c index 523f7b7765..2bdf7b0d4e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -26,7 +26,7 @@ #include "qemu/guest-random.h" #ifdef CONFIG_TCG -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-gen.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/crypto_helper.c b/target/arm/tcg/crypto_helper.c index 1b6b105527..15faa7455e 100644 --- a/target/arm/tcg/crypto_helper.c +++ b/target/arm/tcg/crypto_helper.c @@ -17,7 +17,7 @@ #include "crypto/sm4.h" #include "vec_internal.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 56c2f01532..b8ee45074f 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -34,7 +34,7 @@ #include "fpu/softfloat.h" #include /* For crc32 */ -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 83a1aa08e4..e75cb0100e 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -10,7 +10,7 @@ #include "internals.h" #include "cpregs.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 1991eafe05..4100161775 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -24,7 +24,7 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 24205074cc..e1aadd63f0 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -24,7 +24,7 @@ #include "exec/cpu_ldst.h" #include "cpregs.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index 2822a6b96a..e00b9b1493 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -24,7 +24,7 @@ #include "internals.h" #include "arm-powerctl.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index e663aef2fd..3f8cb358a6 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -10,7 +10,7 @@ #include "internals.h" #include "exec/exec-all.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index fc7a2804f7..f44b9415ec 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -41,7 +41,7 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index 325a231de9..46f347a8c3 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -24,7 +24,7 @@ #include "qemu/int128.h" #include "vec_internal.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/vfp_helper.c b/target/arm/vfp_helper.c index 51f8e92ff7..38faf99073 100644 --- a/target/arm/vfp_helper.c +++ b/target/arm/vfp_helper.c @@ -31,7 +31,7 @@ #ifdef CONFIG_TCG -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H