From patchwork Mon Jun 19 15:55:09 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: 694088 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d91:0:0:0:0:0 with SMTP id b17csp2443150wru; Mon, 19 Jun 2023 09:01:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ63WG+JdAa1Nn0uExSz68m9Ueinov0KDl6ouexaMGp4FO2l1OK/tgyip1FUVEb2wpPhLaWD X-Received: by 2002:a05:620a:2d81:b0:761:7ebe:da with SMTP id tr1-20020a05620a2d8100b007617ebe00damr9067724qkn.56.1687190463805; Mon, 19 Jun 2023 09:01:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687190463; cv=none; d=google.com; s=arc-20160816; b=Lu/yjAZpOpNSedhRweL9JNwiKDkyrFZAZVMFTJJ1rptfTFc8Uo0eJ7PGHcfJqrc7rV jm9tn9zs8Cta4+1SJQQEMCBcdQQb3DwZUXs3sHIKA7N88zDf+L+yo0G3ZRXCTxf4XY91 r3m5vn4QxM+NocNo3MVnWdZTJFCYxz0bGb/sZFzM2ZK/F0tdOerMLfuoFIjj8AsO+M4p XIu89C48Chy3+rt/XwRtHsSquHxIkS83UX1biiiFVnf6Cl254YXhPx0gAWBkuTBvkTvr k7xIVcNX8VUQ9qay173bSqmxPpf35M6d3gCgLEi1VJnO/cfi3FK7iqy3pBEhCFkKrOmH CvxQ== 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=cwyvfHZPNQ11c4/mh/YpFzb69VIPygsGSZVclqK2vfA=; b=RofkJgFadX11yeLmqACS4alwq8EBtHmKdGIWyNod6IZN02+0hXjfREHNsNy6+9/5NW QNxXad2MKk+9kXfEGD/jIuVB87jZtG5hx65SaxlsWkvEn5QLBnscVuyYzg0XwvKS1yRX jg02J+GPCliYnBR7x3MipeLaRdFvWMb1DEAG1IfcGkj0bdS8jUmTCfTlHBhrncoZb2lJ JQSmJYGiTmlS9rFFgKcdE0xYKDf5lPoxG0Oxh3oj6jf1w68puSPIf8pj8mZBMYqMZqui yi00fJNWembboT/a0ObDjFWQLEPGHVJx/M6NQTLsI0KInJFlIJd/iYHO5MHmxdEw/RYv gwYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uvE95LfG; 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 dw20-20020a05620a601400b0076255e83cc3si81916qkb.160.2023.06.19.09.01.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 09:01:03 -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=uvE95LfG; 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 1qBHGQ-00022W-K3; Mon, 19 Jun 2023 11:57:58 -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 1qBHGH-0001KN-JU for qemu-devel@nongnu.org; Mon, 19 Jun 2023 11:57:51 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBHGF-0005N8-2K for qemu-devel@nongnu.org; Mon, 19 Jun 2023 11:57:48 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-51a20c744ebso4297265a12.1 for ; Mon, 19 Jun 2023 08:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687190265; x=1689782265; 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=cwyvfHZPNQ11c4/mh/YpFzb69VIPygsGSZVclqK2vfA=; b=uvE95LfGZYh2BMO6LjSCuZv7DrzxLXTeVmf1iEcOjfgM/jNILBj6FWBKLtzy7WXF/F hJyJIx1ChAUeYzUAbP/aqh/qR6UEGF30oUhuE4HBvBjUngOcDhhs5Ag/a5eb0k+FaWe5 xMJmkllTZXROi2m84dLHtvHJkzu7MVziAeZSJdpZ093QQMghsl7rBogNJoDTlV48cluL ebF4w7200Q/r43Rm+OQf1PSkzIYO6X2+SibKFg1gE/wFiWjXndtl+NdU4zVn/VRrOWiI D9rqswJz4AZNfYOMyp0bvjp0ek7hYbH/Uv/Ov5uNBzrNRj5QpnfAjelxlZuffrotlDrR WH/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687190265; x=1689782265; 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=cwyvfHZPNQ11c4/mh/YpFzb69VIPygsGSZVclqK2vfA=; b=TT0eqLmoYPQcgvEhgG4Twdi5NY2kzswMHt7HX677ECOVNWP9YBRi9F7CM2q5Bfz6hk fIvBGokoJ3MjNeZQfL1wR9s+d70a1n6GhDAJRRc/XmhYQm/KZvnRXaRSy+vab1/8vmyy wlf+x9cBCOagsuQMt/TfsS+VP1yg9zjnO7pjpxb/AYAXZesjoSYdgEckggA3D0eBwgrS SsFdlxpJNy6nswM1BpQJ9pud1uzKMoY5j4UWua4R+Sk/Hbyg+rmLNsav8tKdTdUY3sFl 0eaIETOpzdJ6xyEPJnzr+sMhTWBc3FL+S3wwCpzp0CXOhZPcP4CHBNXsDGUm03eOot45 TGrw== X-Gm-Message-State: AC+VfDw7YaRH5DdJXBfgcTTJfi18hJWDfrGzTyuynfhL4LaoOUuNm5jr Bk86vAPC1EuiK2J2ajJLN392jSSLM1P2auwPatny7g== X-Received: by 2002:a17:907:320e:b0:96f:912e:5ec4 with SMTP id xg14-20020a170907320e00b0096f912e5ec4mr8509343ejb.16.1687190265375; Mon, 19 Jun 2023 08:57:45 -0700 (PDT) Received: from m1x-phil.lan (sar95-h02-176-184-10-225.dsl.sta.abo.bbox.fr. [176.184.10.225]) by smtp.gmail.com with ESMTPSA id pj20-20020a170906d79400b0098822e05eddsm3090316ejb.100.2023.06.19.08.57.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Jun 2023 08:57:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v3 33/34] target/arm/tcg: Rename 'helper.h' -> 'tcg/helper.h.inc' Date: Mon, 19 Jun 2023 17:55:09 +0200 Message-Id: <20230619155510.80991-21-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230619155510.80991-1-philmd@linaro.org> References: <20230619154302.80350-1-philmd@linaro.org> <20230619155510.80991-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=philmd@linaro.org; helo=mail-ed1-x52d.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 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/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 +- 11 files changed, 10 insertions(+), 10 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 13d59d8417..6516852c06 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 63ed29b841..425cc86c7a 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" #undef HELPER_H diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 58a573e21d..5573c0c15e 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 bb8756d0ff..00b73c9151 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -40,7 +40,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