From patchwork Thu Jun 8 13:31: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: 690529 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp319293wru; Thu, 8 Jun 2023 06:33:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4/pbxLVT8ZIWPD0/A+NqgluYQSXuhehuuW97mqFogWymRMiU9iaNwF/+op+Mmi27bMDIIr X-Received: by 2002:a05:6214:27eb:b0:62b:33cd:e0b5 with SMTP id jt11-20020a05621427eb00b0062b33cde0b5mr1571734qvb.26.1686231192993; Thu, 08 Jun 2023 06:33:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686231192; cv=none; d=google.com; s=arc-20160816; b=etGsWpZy4W2Hb96Gj3l/mvDxXyrhcAP3drDA78DoY2vjFls4FdCQ6aX1Xx1yIZVXsW 0x4M96/9SfC1/a8Zfcxq1RyJkdDqyH5gusSQ2zS9LeWs5J4n3ESDq0qG86OHz9wuQdTR gbbz1ygDKvQOIsZbYvYfJ+xHoR8M9CeVYw9s77iojcmXsUHyKQcqFJqVgGDt0lfgdiB9 Muk6N7TYrrM1phCAZULdT2oKFtbO8xBdf2wu7g4SMqTM37nsF2pIGsEmLuaLv6Y2/rO5 sw2MGh1g+6pN3Zn+lXC1vjygV0UE49GWxhGZyEhMnCp1iwQO4gclUL1GtSDTFKhWuBh+ RdMg== 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=QX7oEag8EHw5/rO2IwkanQ9xp1UV8fgADH4pyLkBN/8=; b=GxPBUxEj+Qye+KudKFaZg5xHH6sYn9qEs+z2yGBCKueXP8S3L1CkKmGlLPON+pqwlp qCmvrngSH41zqH7t/miSkIICuQLjwfq/Irtek45lR5MpZRWaEDFfc6pCB7tAWzkjbBxs omUsHRbt6xwL9uXNuzv+LtqUJQSVeNigIfNSxWZE5DPn5bi2j/V5SVHyiYU1ssADi4vI 33C+PtQ9mlTTFERgXxSnwwCtWZAOnYn2LHx6eyzfv0Wi/kFbr2O0V9+46JDofqX9Snaa W2LnANAjTH6zha3F1sTASUxdCXxhXLDeKfU3v6WjvfeGy7mYHt3ZUuyt8OKbWafp0V9P gy9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yty491Tz; 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 dv7-20020ad44ee7000000b0062618936271si720896qvb.504.2023.06.08.06.33.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jun 2023 06:33:12 -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=Yty491Tz; 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 1q7Fje-0001Mq-28; Thu, 08 Jun 2023 09:31:30 -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 1q7FjZ-0001GG-9h for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:25 -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 1q7FjT-0005it-Bs for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:24 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-30e412a852dso442172f8f.0 for ; Thu, 08 Jun 2023 06:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686231077; x=1688823077; 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=QX7oEag8EHw5/rO2IwkanQ9xp1UV8fgADH4pyLkBN/8=; b=Yty491Tz/CLkQDSwq+5sZgxbDG7fw7qXKqg0I2+qqFNlYiT0oe+BLvr1I9fRtno99Y 3wm+0fYUFbVJNzXFKo6oW+bpOF2rTcqGWoL2W9HqvNeeLIyDQy8LmSb2wCUSvpJFPxl9 m0JFSV7phvOItASvAbXPHx+PrnsLtMkKiHbbLs0du3kluYxjMYsdIImMf89tg6QCtlV6 TCoKwMQpYqT9s3iCVMvKQ6XtLoO0jNlqKWhSA1Ai5Q4JIgoiEImHDYM+F14RpKAjgH+u wiBvGPy/6F/Jds5Jwkr+gGCy1YuJi44biORmwvI/BzEAdLRatA59FiZST2qsTno6FOdW Ze4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686231077; x=1688823077; 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=QX7oEag8EHw5/rO2IwkanQ9xp1UV8fgADH4pyLkBN/8=; b=Dlf7CFneUfmda3aq2F+rej5esGHqat7hsdlTgI2e6YkYzJkfzgvORWy0jjNsXgLK/e RcU/Xb/y+G6jG4lXSRQtAY/v2qzJeNvmez2GpkDeg5Jg2Mktu4mLXNCwtIsklF4CiB4F qQQhqoHtQMvW79Mw6N15tCH8K+3aEEIsYmB8AcyTrMhc2n2Z/J25kSuq9EjBVPuj9aeW g7hmKbfjdpdvY8daSdmVYmWYLSlhzJnHSKOV4dAm2MGrrx4qB7972AJn9+Bnn+h/+oPd 7QPmnvi2NplYXv+LDaKuf2qw/WPsLPmD7UzIHe58CVHy2V40bVB8TG482uB8dXtz412Y Glsw== X-Gm-Message-State: AC+VfDzh5/5oxpYpguR/gymhcNPOhE3p2sSFyQA8dqteH5KjRvAKrxCj 6qFEAsamgcptbRleAePU9krfTCZSnExBt09g55Q= X-Received: by 2002:adf:dd46:0:b0:30a:e9cb:1a2e with SMTP id u6-20020adfdd46000000b0030ae9cb1a2emr6312547wrm.65.1686231077545; Thu, 08 Jun 2023 06:31:17 -0700 (PDT) Received: from localhost.localdomain ([176.176.169.168]) by smtp.gmail.com with ESMTPSA id cr5-20020a05600004e500b0030c6751a49dsm1596961wrb.115.2023.06.08.06.31.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 Jun 2023 06:31:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/5] hw/remote/proxy: Remove dubious 'event_notifier-posix.c' include Date: Thu, 8 Jun 2023 15:31:04 +0200 Message-Id: <20230608133108.72655-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230608133108.72655-1-philmd@linaro.org> References: <20230608133108.72655-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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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 event_notifier-posix.c is registered in meson's util_ss[] source set, which is built as libqemuutil.a.p library. Both tools and system emulation binaries are linked with qemuutil, so there is no point in including this source file. Introduced in commit bd36adb8df ("multi-process: create IOHUB object to handle irq"). Signed-off-by: Philippe Mathieu-Daudé --- Note, --enable-multiprocess doesn't seem to be covered in CI. --- hw/remote/proxy.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index 1c7786b52c..2052d721e5 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -22,7 +22,6 @@ #include "qom/object.h" #include "qemu/event_notifier.h" #include "sysemu/kvm.h" -#include "util/event_notifier-posix.c" static void probe_pci_info(PCIDevice *dev, Error **errp); static void proxy_device_reset(DeviceState *dev); From patchwork Thu Jun 8 13:31:05 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: 690530 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp319923wru; Thu, 8 Jun 2023 06:34:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KAqaBQZ41Rf97tQP4ul+4MPwfWZBBT3D7QwFrtnQilQfH6ursw2sLGZ+0TDsiKVY5VUZw X-Received: by 2002:ac8:4e8e:0:b0:3f9:c057:599e with SMTP id 14-20020ac84e8e000000b003f9c057599emr6037493qtp.63.1686231270890; Thu, 08 Jun 2023 06:34:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686231270; cv=none; d=google.com; s=arc-20160816; b=jxHz0gkKSEyNEPlu4Rb5dRMN7em+6HSNqm7H8MZHoHXBhDR1PJjuDGeVLvT9XjBcFN l7tmzJeQky/106nuVTly/bYg8qP2dQ36nZtoS7+u/kjfFdzb97rdWjuzbLvLcr1BM8Kn A/LbkXRpSrNZE/chZrsE0NJyZN8KyvutaYmmgxudW+soyUAzbsU5qt+JURgtPD7ysd58 ajOglqiE12A63nRutk47m+YyJ+TmYUakgxKIcBMICOg9O+GSXDeDC+nVpG1ivbms5qrk Z4LkW4bdPJrW+4wP2aT56ajoxP8KJSLsJllW/kSh3ImVUEibO1Xt3EXWOy5kRe6sK4hB cUgQ== 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=R/F/L6gm+zkVK5EOXjzGUKkb1zlWJACWpFKWw3y8T80=; b=vFZBqQ9b9tng6fjI+2wLpI289/48z5OykUnczAJJTySImMDb7k8DsUrTLtxXhgRICy Aeapw/FjXQyfD+ADh/onJxUvO2pplu0thiwAE2ryNjqVaFLF3x0CFLk7sOyYgLIBvUMx 2wKVlg9TsCA43j9URN6cVccd3XF006rcBOmFfPSNLxWxHmqVk6rY5GiSHS6GB/viHdJQ PjHJq92eg+9SzgOg9fdEg81xLPkMkJy3VNeOnR26r7OfB4nGrFIcVeNdC3cvamOwfVgw h7UPnDHKugZOvug7FXpgwFCOUvH6GK3PXF7qd/bG5TuZVsfie9DGN/USBUXhRcZiWAfX kWZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JSt74Soc; 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 w3-20020a05622a190300b003f21ee89806si535560qtc.700.2023.06.08.06.34.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jun 2023 06:34:30 -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=JSt74Soc; 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 1q7Fjf-0001UF-5z; Thu, 08 Jun 2023 09:31:31 -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 1q7Fjd-0001QL-45 for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:29 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7FjZ-0005ku-2P for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:28 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f6d38a140bso5052315e9.1 for ; Thu, 08 Jun 2023 06:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686231083; x=1688823083; 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=R/F/L6gm+zkVK5EOXjzGUKkb1zlWJACWpFKWw3y8T80=; b=JSt74SocMJbSpH9d7lDvOU8mQoi0/RVg2JluqSvjpvJuA++dwnyncBL3H5qJ/SNLFo r/YOlTwcSKMvK7rXip538USYAqqlwqVzfPX63N8eKGjqZqJbvIj9Vy/++AG85RMiNgtq vn7vLJgQG1ZveR8Z5wFj3XKpO+IxmB6Ck7kW98u7WGwA42Cel+UeqA3oOrewc4LaSfQ4 fpbqs4NnZItGRGApnOCfQ+QZDGn3AUduEQfuIBpbYgAcaGnziNnC673nM7OYo/5d3asW 7rZHMldU/Y4n4JvhGreiI9b4wN8IWNnRkDqJBPdBrKpqk23ER0RB4SHmb+ZhuF7GqLrx F4wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686231083; x=1688823083; 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=R/F/L6gm+zkVK5EOXjzGUKkb1zlWJACWpFKWw3y8T80=; b=jKjrKBGdnMjk3HgKVys0WPH9lMAWu6dFVzlkhB0THsme8shaIeJ03DPw2vdlndJgd4 g7CnSQ6OH3eCskgrsFqPWN2AYhl0Z6aOnkIiRgvX5uuHjobTU/6bNIqvZH9R0dWitwhV Aep46fB1W9iiWPuXm8bDprxs1hkfBrasibfmLasDtt1Zj2R6bjTf/B5k9XTUHXHw1D8t LFE9rh8YP3KZOqepC3LP4LV3Lb8Gafg3K2JG75egPETmryvYqqt6hA3lWGqrFXCVPPgn 2Bmz/O9L2SYPa4bQpHd182iFDzJPR2/h+2HuZyaqjcJLg0cvExkJ79GzwD0PfX/Bs91z a+kw== X-Gm-Message-State: AC+VfDzwysX1cZAVCY5VP8PNqAIUbUrirE9h9E3pbj1ZHmrLR8Iah/wN zKMBXwGdMzKnvZ3Bkj6d3pqCoJOWJQbwjrP50RY= X-Received: by 2002:a05:600c:da:b0:3f7:a20a:561d with SMTP id u26-20020a05600c00da00b003f7a20a561dmr1405285wmm.8.1686231083175; Thu, 08 Jun 2023 06:31:23 -0700 (PDT) Received: from localhost.localdomain ([176.176.169.168]) by smtp.gmail.com with ESMTPSA id z10-20020a1c4c0a000000b003f50d6ee334sm1961021wmf.47.2023.06.08.06.31.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 Jun 2023 06:31:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= Subject: [PATCH v2 2/5] tests/tcg/aarch64: Rename bti-crt.inc.c -> bti-crt.c.inc Date: Thu, 8 Jun 2023 15:31:05 +0200 Message-Id: <20230608133108.72655-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230608133108.72655-1-philmd@linaro.org> References: <20230608133108.72655-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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 'bti-crt.inc.c' as 'bti-crt.c.inc'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée --- tests/tcg/aarch64/bti-1.c | 2 +- tests/tcg/aarch64/bti-3.c | 2 +- tests/tcg/aarch64/{bti-crt.inc.c => bti-crt.c.inc} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/tcg/aarch64/{bti-crt.inc.c => bti-crt.c.inc} (100%) diff --git a/tests/tcg/aarch64/bti-1.c b/tests/tcg/aarch64/bti-1.c index 61924f0d7a..99a879af23 100644 --- a/tests/tcg/aarch64/bti-1.c +++ b/tests/tcg/aarch64/bti-1.c @@ -2,7 +2,7 @@ * Branch target identification, basic notskip cases. */ -#include "bti-crt.inc.c" +#include "bti-crt.c.inc" static void skip2_sigill(int sig, siginfo_t *info, ucontext_t *uc) { diff --git a/tests/tcg/aarch64/bti-3.c b/tests/tcg/aarch64/bti-3.c index a852856d9a..8c534c09d7 100644 --- a/tests/tcg/aarch64/bti-3.c +++ b/tests/tcg/aarch64/bti-3.c @@ -2,7 +2,7 @@ * BTI vs PACIASP */ -#include "bti-crt.inc.c" +#include "bti-crt.c.inc" static void skip2_sigill(int sig, siginfo_t *info, ucontext_t *uc) { diff --git a/tests/tcg/aarch64/bti-crt.inc.c b/tests/tcg/aarch64/bti-crt.c.inc similarity index 100% rename from tests/tcg/aarch64/bti-crt.inc.c rename to tests/tcg/aarch64/bti-crt.c.inc From patchwork Thu Jun 8 13:31:06 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: 690531 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp320020wru; Thu, 8 Jun 2023 06:34:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6lCTLcM/3/txamlNsDpfJcz/rnx3gRATSpXaY+nPN0GAB7auAx8CxI8gMvnNicNnW5s406 X-Received: by 2002:ac8:5dc9:0:b0:3f9:ab02:612e with SMTP id e9-20020ac85dc9000000b003f9ab02612emr7020693qtx.20.1686231280638; Thu, 08 Jun 2023 06:34:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686231280; cv=none; d=google.com; s=arc-20160816; b=z4kF/iwdX4wNznzVNt20Mxdstjgpt3zwUGeOq/6C5tOCG0uRVIkUEor6SM4cy72O67 X0sSrj31Gz0OCOyfz9r6MTcl0zs/RfwNUiYzRpPsc5tezxuQssUnxdD3pM7LnoQJow2M 3l5uu0NdKv6mAj2VpngXwu3UsDEZjBep9S7sxfRCmOaGFDD+DYLIZZqLTCELuNbhoGlw bZFA/Kj04y2y/H8EH9mWSKvO1uVGGczR8MWdq8irGEbQEorMlvq99GQSIkoFtv6vH5XF qd+Vw+8CB9ywWcmcVrGr7dQ8nG/a1uDIsLAjHGS1sXsaGBQwTpbnWhCg6AqVBFkbEucs X8bg== 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=oIvtCmiWepPA7NXEFbXWWLePEDf5Lnkm5evgEG2zaNg=; b=TGIOtcfqce+zUT7WMRlPFS/2Us31rWHhywRh2Bdxy658DOW2DdIRN05FOmVlIJHxf/ MGMa08L6LumvnrIYS0VkWCQjoqQ1zgcckwUQUCgGaKutFklRMd5igwysmHtq7ywQanMB TP6Ytn8yk93Zwn4B15/hlzV3VBjzWDhBwQm76w4hUeQHlQCl+/Ilb9jqkDhwFSNM5Uhj JYw9hIu+bxBohkC2JHsf8w7z8n4U2NPmAT5pcdiCchinvaw+jwyqy3C5xQQ6yUqQrLBj mZcqSHNV73w20D5EkBcNOpyX+394bmtScuZZIIA7kcw7kJghfPL+mSZEJN8g2gwrJJzK tuyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YnT/kOj3"; 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 j20-20020ac85f94000000b003adff1955edsi578883qta.662.2023.06.08.06.34.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jun 2023 06:34:40 -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="YnT/kOj3"; 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 1q7Fk0-0001f9-Bh; Thu, 08 Jun 2023 09:31:52 -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 1q7Fjh-0001Wc-Kb for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:33 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Fje-0005nm-JQ for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:33 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f7f6341b99so4053425e9.2 for ; Thu, 08 Jun 2023 06:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686231088; x=1688823088; 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=oIvtCmiWepPA7NXEFbXWWLePEDf5Lnkm5evgEG2zaNg=; b=YnT/kOj39J4MceJDSe16IwcpGvYmeh17Dvh5M3p2jlc9+Uqw1EXdQEVCXWysqW+SEd wAMadfDa4QCNDQJda39OAi6CvgZMNHCPkpYkXCNgdKYN59zd5ZoLk2VCrjBALLJuwQt+ PJYcPL5BV9L4YuLzQdkN7gqLl9RbGBCxRECaCTvMk4IYk9reN5aMFnCecvkN5HBugxMR 1DQVHpoTBtGjZD1KXfNmxdJZ91lLEhQtnleGrLVLsn2S2MzcsjgXbOvadmIS1vx7okE2 Et/aVv5U/a3wQryz/kuZ9TZKuJ5GP8E1wl9asI7qJkrTCr+diA71QG+yGFFudCfUvPFR 4OEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686231088; x=1688823088; 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=oIvtCmiWepPA7NXEFbXWWLePEDf5Lnkm5evgEG2zaNg=; b=as4L/QtlPyM9WSkcGnNPfwRKymOGM8iqDvaHpMyAgnRMUQp2hCbwVggoj1lwz38jxa LoT2dZg+l68vOn4L/2qwfiX3deCkJcGGSuFBON8bdRgtEDrWzFiaqvmUwNrcyI3i2HQA S4YRrXFkrzZeO5vWzwQCSamuIYLn1tv1H/SqynQK6PKW86Ta4odQLz00afpc/WCJy4G5 icS28N/wvaUaO1F+nj7pdyN95LLgqVaGG56OASceMZxxybNfe0jzYWyT7nQPUbf8lST7 Njo34wHdbIWHrRXduSbEj0r/l1iQdbJJ3+Ezevdts6PicdKtJgPnc1e8Q9LdhsuTdIlN Sspw== X-Gm-Message-State: AC+VfDyGf1LlCj4Zss01dh1GfrF3qI+o3tcFbISvMsWQoVN8QWN4hWii bSING+41kbqscKLLF74scnq5BDQKol5Y03DHF0I= X-Received: by 2002:a7b:cc08:0:b0:3f7:fa21:f66 with SMTP id f8-20020a7bcc08000000b003f7fa210f66mr1375067wmh.26.1686231088711; Thu, 08 Jun 2023 06:31:28 -0700 (PDT) Received: from localhost.localdomain ([176.176.169.168]) by smtp.gmail.com with ESMTPSA id c25-20020a7bc019000000b003f7e6d7f71esm2035290wmb.36.2023.06.08.06.31.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 Jun 2023 06:31:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/5] target/arm: Rename helper template headers as '.h.inc' Date: Thu, 8 Jun 2023 15:31:06 +0200 Message-Id: <20230608133108.72655-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230608133108.72655-1-philmd@linaro.org> References: <20230608133108.72655-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 the included templates as '.h.inc'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/helper.h | 8 ++++---- target/arm/tcg/{helper-a64.h => helper-a64.h.inc} | 0 target/arm/tcg/{helper-mve.h => helper-mve.h.inc} | 0 target/arm/tcg/{helper-sme.h => helper-sme.h.inc} | 0 target/arm/tcg/{helper-sve.h => helper-sve.h.inc} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename target/arm/tcg/{helper-a64.h => helper-a64.h.inc} (100%) rename target/arm/tcg/{helper-mve.h => helper-mve.h.inc} (100%) rename target/arm/tcg/{helper-sme.h => helper-sme.h.inc} (100%) rename target/arm/tcg/{helper-sve.h => helper-sve.h.inc} (100%) diff --git a/target/arm/helper.h b/target/arm/helper.h index 3335c2b10b..4218d98b51 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -1039,9 +1039,9 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) #ifdef TARGET_AARCH64 -#include "tcg/helper-a64.h" -#include "tcg/helper-sve.h" -#include "tcg/helper-sme.h" +#include "tcg/helper-a64.h.inc" +#include "tcg/helper-sve.h.inc" +#include "tcg/helper-sme.h.inc" #endif -#include "tcg/helper-mve.h" +#include "tcg/helper-mve.h.inc" diff --git a/target/arm/tcg/helper-a64.h b/target/arm/tcg/helper-a64.h.inc similarity index 100% rename from target/arm/tcg/helper-a64.h rename to target/arm/tcg/helper-a64.h.inc diff --git a/target/arm/tcg/helper-mve.h b/target/arm/tcg/helper-mve.h.inc similarity index 100% rename from target/arm/tcg/helper-mve.h rename to target/arm/tcg/helper-mve.h.inc diff --git a/target/arm/tcg/helper-sme.h b/target/arm/tcg/helper-sme.h.inc similarity index 100% rename from target/arm/tcg/helper-sme.h rename to target/arm/tcg/helper-sme.h.inc diff --git a/target/arm/tcg/helper-sve.h b/target/arm/tcg/helper-sve.h.inc similarity index 100% rename from target/arm/tcg/helper-sve.h rename to target/arm/tcg/helper-sve.h.inc From patchwork Thu Jun 8 13:31:07 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: 690526 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp318873wru; Thu, 8 Jun 2023 06:32:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ793ghChgpzLhXIC5YLuVoQhLMCEcUN8u1EqBtwSe8BpXRcX9bcY6OrYNhvZ53PZhW5HRTd X-Received: by 2002:a67:f1ce:0:b0:43b:5823:6664 with SMTP id v14-20020a67f1ce000000b0043b58236664mr2012898vsm.3.1686231144994; Thu, 08 Jun 2023 06:32:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686231144; cv=none; d=google.com; s=arc-20160816; b=TddmlL5DOG+dEXulrxie9Im0rEXg/pI10eR2MV25Mp2Bz6etdDhO+43jKYZcKRuKMn WOAdrEHEE5ak40cBn37AQdsurSOM5Yc5udUsGT9qW2kOoN2keeIvAtTRb2x1OQ74EhKS MC0OpTkIjvISg9w5njnu1mR7HPyP7gdkSn3aOfOuKjOYlZOalGfvTZe8/DLzUdrmY/2I oKectRjZRnYEWidkg6ff+7FO7e69MuSjkt6zJT1PkLwSwY7LOMXrLyLljcoU0Y/Ejl25 pinAGgZMDlhWcSOKh3/orn75v9TIxqMyuO1Rmsrgqt2qtRHWldcp8+aeIWV/rUpSmBXp LA+g== 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=ftNyyaWMFAqAjN5bg1efHl67xyXCX1hnkKn723kFLZc=; b=xff3TH5JdX468tLweQKBynS6TWwnlT+TQA1j3NWmdycSX62eGoSa8j0rIqmQBdKpYN 3zGZB1yleWjkTJgq6pj3DQzLnjULvS3b/MTTDUPcvL19niAmyIudRv63JED7WaPhha6O UZ9SaSaT9DQ+F3PO1OSBHot0LMRvIpzDNO2Z1KevCDSzkGxN27W3ya1NjSE7ILyQaSqz 18hp2/9yfisccNQ1Mypa/uOQ6K28ak2hn6RMLrJ/Zr7RtoZbf2zJ54g2JGjxEFlDYEbW is3R44juJ2h9lXeUPS+AcwGcI3OcyeCLTkvfVjygVF5otd8D0JP/ms23coaNhbTBf4q+ b5MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wlwH4be9; 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 u28-20020a056102073c00b0043b2f011536si71639vsg.335.2023.06.08.06.32.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jun 2023 06:32:24 -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=wlwH4be9; 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 1q7Fk0-0001gP-PW; Thu, 08 Jun 2023 09:31:52 -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 1q7Fjm-0001XE-8M for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:41 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Fjj-0005pt-SY for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:37 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f70fc4682aso4099875e9.1 for ; Thu, 08 Jun 2023 06:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686231094; x=1688823094; 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=ftNyyaWMFAqAjN5bg1efHl67xyXCX1hnkKn723kFLZc=; b=wlwH4be91XESizOmdkrTMO2Lp95KoO5L9JkPWBq3PbHH16N38mTLfLh/iDxAKUh6Dn +w/3dhcGfjeGED+Vuj50Y5WZ71jgxpVfoYiWzfXcI6nb7oxAIaPAY48fmioy5H1M0A0P fddpeLTdW9cqLCbw8ZsRlRhi73lpqyJ2SuNgUEJS5Xvkb/WPLVP8QhEZUaWXKWwLxOK4 eVwlEZbRfqOtve6lXEhqRaKlxXSwPX9lcsndf8rA+AsdYTJUBZpt2phhDAEJPO2NW5L6 JpkrNAqoEhRgsy8SvytI0GUckndi1qZ4EfCK6tLMKE1kM5bQCnb7uFGtChi89rqhTmMu lQmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686231094; x=1688823094; 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=ftNyyaWMFAqAjN5bg1efHl67xyXCX1hnkKn723kFLZc=; b=hEq8ph5hzr41dYLpCBYrxW3nRRDQQCElpVPY3DY8aLNO+HS19V4xn0slnHC79v2UGS sA4vuQZ36HJG4+workzLjo35/9ZuZGNdsV9Si+uPlnufYeP5+WAnMb/0tkb5qL5Vy1qm AIqCNFB93Gb21mmPZj5JS4lftVjrLIXEwn8+I2TleErUpwnneuERJ130SozQ/9xMIYzv SOzTwSBTSc/jCq2T7eFGrp74sdc9HJb+6p9fWpKjLVB5oOaptbkool2zywUbvBNrSpvb yN5uhtK5my1ENMcUOaGnrWr1vJz3viQ+QWwYXtesv1p3DXqSnZGC4I+ztufSTU6Krbf8 f/Pg== X-Gm-Message-State: AC+VfDyHYFM6/5d2rPuCD/V4yqNft0IKMtyRf1AEhCNB54gfdZrM7nPG m+RBmqL62ugQQMSawPJQXYdc/6z9xuxJaw7ZW9Y= X-Received: by 2002:a7b:c7c2:0:b0:3f4:2452:9669 with SMTP id z2-20020a7bc7c2000000b003f424529669mr1469849wmk.0.1686231094400; Thu, 08 Jun 2023 06:31:34 -0700 (PDT) Received: from localhost.localdomain ([176.176.169.168]) by smtp.gmail.com with ESMTPSA id 14-20020a05600c22ce00b003f7dfdf36bbsm5286778wmg.45.2023.06.08.06.31.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 Jun 2023 06:31:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/5] target/i386: Rename helper template headers as '.h.inc' Date: Thu, 8 Jun 2023 15:31:07 +0200 Message-Id: <20230608133108.72655-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230608133108.72655-1-philmd@linaro.org> References: <20230608133108.72655-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 move the included templates in the tcg/ directory and rename as '.h.inc'. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/i386/helper.h | 6 +++--- .../{cc_helper_template.h => cc_helper_template.h.inc} | 0 .../i386/{ops_sse_header.h => tcg/ops_sse_header.h.inc} | 0 .../shift_helper_template.h.inc} | 0 target/i386/tcg/cc_helper.c | 8 ++++---- target/i386/tcg/int_helper.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename target/i386/tcg/{cc_helper_template.h => cc_helper_template.h.inc} (100%) rename target/i386/{ops_sse_header.h => tcg/ops_sse_header.h.inc} (100%) rename target/i386/{shift_helper_template.h => tcg/shift_helper_template.h.inc} (100%) diff --git a/target/i386/helper.h b/target/i386/helper.h index e627a93107..48609c210b 100644 --- a/target/i386/helper.h +++ b/target/i386/helper.h @@ -203,11 +203,11 @@ DEF_HELPER_1(enter_mmx, void, env) DEF_HELPER_1(emms, void, env) #define SHIFT 0 -#include "ops_sse_header.h" +#include "tcg/ops_sse_header.h.inc" #define SHIFT 1 -#include "ops_sse_header.h" +#include "tcg/ops_sse_header.h.inc" #define SHIFT 2 -#include "ops_sse_header.h" +#include "tcg/ops_sse_header.h.inc" DEF_HELPER_3(rclb, tl, env, tl, tl) DEF_HELPER_3(rclw, tl, env, tl, tl) diff --git a/target/i386/tcg/cc_helper_template.h b/target/i386/tcg/cc_helper_template.h.inc similarity index 100% rename from target/i386/tcg/cc_helper_template.h rename to target/i386/tcg/cc_helper_template.h.inc diff --git a/target/i386/ops_sse_header.h b/target/i386/tcg/ops_sse_header.h.inc similarity index 100% rename from target/i386/ops_sse_header.h rename to target/i386/tcg/ops_sse_header.h.inc diff --git a/target/i386/shift_helper_template.h b/target/i386/tcg/shift_helper_template.h.inc similarity index 100% rename from target/i386/shift_helper_template.h rename to target/i386/tcg/shift_helper_template.h.inc diff --git a/target/i386/tcg/cc_helper.c b/target/i386/tcg/cc_helper.c index 6227dbb30b..c310bd842f 100644 --- a/target/i386/tcg/cc_helper.c +++ b/target/i386/tcg/cc_helper.c @@ -58,21 +58,21 @@ const uint8_t parity_table[256] = { }; #define SHIFT 0 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #define SHIFT 1 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #define SHIFT 2 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #ifdef TARGET_X86_64 #define SHIFT 3 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #endif diff --git a/target/i386/tcg/int_helper.c b/target/i386/tcg/int_helper.c index 599ac968b0..05418f181f 100644 --- a/target/i386/tcg/int_helper.c +++ b/target/i386/tcg/int_helper.c @@ -448,20 +448,20 @@ target_ulong helper_pext(target_ulong src, target_ulong mask) } #define SHIFT 0 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #define SHIFT 1 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #define SHIFT 2 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #ifdef TARGET_X86_64 #define SHIFT 3 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #endif From patchwork Thu Jun 8 13:31:08 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: 690528 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp319189wru; Thu, 8 Jun 2023 06:33:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7yQVg5HPmtmXs4i94iytaGzyVkwkvF4ZjSve3TUthPi7SLGly96Voqyga71nkXMmjKSB7w X-Received: by 2002:a05:620a:4545:b0:75c:ce32:a83b with SMTP id u5-20020a05620a454500b0075cce32a83bmr6613999qkp.4.1686231180115; Thu, 08 Jun 2023 06:33:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686231180; cv=none; d=google.com; s=arc-20160816; b=mm6hUu84HkN5bF6dN+RCpTSQJD4TjwC+j0xzwzCI2H2XuYEjef0WIRCWTcXh/v/rPz 2bUf9BN00iHZGxs5ECnN3lK2+JV5wYuSoawG3Pq/MOafA6EhYCqfFV4v2eWHV0OdDCua BQEgavIxIZCutKE55RZLvrxu6pnbX9hG82XZYu+BXWU1e4zg5oPlBV20nCRmiAk2lEbR l00p2WFPxcTcumHQolfab9bkaQJ3LbteAYFrOo10RLsKyq7yk+JFsljI80YeT9VMSIlF WrtHZF/Nhfw/6EZzc+wtzK+VxzkdsDDf+nNPQ34tVbMXIm0F2MIRc76NNxOwGsobOrzH JpVg== 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=Ka4gQMrNU71yCnx4mXC3BxyVl7nhdDcW2Dl9VUPw4qk=; b=A6TE2aeqw7+ViLFVYKPZksngkrHQOoqXFLYkUgle6qVXwh7w77FmfF1KnI8nLA9VrA xxs0Gap8bwB0GeEEOharfBkjaZixo6vxf73Os8kR09atmdetQt91d9FTXJvOFJ9fJ9jm DN3cCQ8C1RA1ncp0hpz4+juqOCATVQRzOTsq3zcM9FEwUFLtJj4Q9O1Z7Jw/IW+gBEH3 6FF36QBB+qwmrVGOo0G7SliX72Hj7aNAnG496N5SrtBLSlZNpOVRjHCNohPS7aMTuPp/ OJ4DEWh7f1Hv5QQvwS3tKj61kw6hIUAjjZdr9UD+EquWCbpmfrlXjFEQrrJ9CvQcQY8k a4HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gxzkP64c; 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 q1-20020a05620a038100b0075c974ce523si563833qkm.577.2023.06.08.06.32.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jun 2023 06:33:00 -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=gxzkP64c; 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 1q7Fk1-0001hd-9Z; Thu, 08 Jun 2023 09:31:53 -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 1q7Fju-0001cI-K3 for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:48 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Fjq-0005s1-7w for qemu-devel@nongnu.org; Thu, 08 Jun 2023 09:31:46 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-30c2bd52f82so650030f8f.3 for ; Thu, 08 Jun 2023 06:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686231100; x=1688823100; 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=Ka4gQMrNU71yCnx4mXC3BxyVl7nhdDcW2Dl9VUPw4qk=; b=gxzkP64cYDC9HsGjAS596ukOQFPFPt/vAv2leGpR1jZDzdrTrIYWTbFfujjOtlv4Nk ASyvgFdrZeajoltKQuLO94/Bn6PR3euSM3zQzBYZF40/lu6VbUlDUnacnBjfS2pFxl5d +OOejzs4JZx1TknB5c+OveRolhgvWP4hvsGJvDyHed/+kjFsLao2KUpiM1kicc6wrEu2 tZxO0GUciaBat/6Je200K3AgFFFAkOB/zB6D898AlSykQnN3Br7AJABGxMtde5aioFvC RQUFBXtw7s/663aP6e+9xe8b+CSJSmWG0ADNpZ5k8R7f4QumW2NVvgbnB7fb8ZzTluCK nuEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686231100; x=1688823100; 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=Ka4gQMrNU71yCnx4mXC3BxyVl7nhdDcW2Dl9VUPw4qk=; b=lMWuBnwvaL5AqQD7pF8lWsrniZziB0HPX5sVysYGckz0ArgYWC0sNqqJdjLtibRVTy hWfRH+MtDqNVBZbaHxvl7P6QmKyQAuKumVj1lDizYrae6yn/2Ur4lkr/wmyZ5x6zGh8t DlneAoYfoJYqGAtuehOcuLCvMxVfPxgDt4rVIwdObJsSev6JXq9+RLU1a+IGiZ4qE/f3 W0FjacRFlKNqxNgZI9u8MpvwCemphPreQ1QYMzlzfx+p8mWKduQ1vpe48xc0DfP91rCU BH1osesG9Fv6MnRtqspYxF3VqSHlrIOAhkRm8rnt6Y89ExjU1LMMN97tREEytKLp5rWu PIwQ== X-Gm-Message-State: AC+VfDykTWUQIsw6zr1DE5PqGjUnxPzyEfDCJO1YiW112oUYOMP3/Qyz D2XOGWWeVU7uLBcX87TiaHswi5kZfBnbEFKSwIk= X-Received: by 2002:a5d:4538:0:b0:30a:eda0:71c5 with SMTP id j24-20020a5d4538000000b0030aeda071c5mr7055600wra.16.1686231100033; Thu, 08 Jun 2023 06:31:40 -0700 (PDT) Received: from localhost.localdomain ([176.176.169.168]) by smtp.gmail.com with ESMTPSA id p23-20020a1c7417000000b003f60eb72cf5sm5348708wmc.2.2023.06.08.06.31.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 Jun 2023 06:31:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/5] target: Bulk rename 'helper.h' -> 'helper.h.inc' for all targets Date: Thu, 8 Jun 2023 15:31:08 +0200 Message-Id: <20230608133108.72655-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230608133108.72655-1-philmd@linaro.org> References: <20230608133108.72655-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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 the included 'helper.h' as 'helper.h.inc' for all targets (updating the documentation). Unfortunately since the HELPER_H path definition is used by all targets, we have to do all changes in a single bulk commit. Mechanical change doing: $ for t_a in target/*; do \ if test -f ${t_a}/helper.h; then \ mkdir -p ${t_a}/tcg; \ git mv ${t_a}/helper.h ${t_a}/tcg/helper.h.inc; \ fi; \ done $ sed -i \ -e 's#define HELPER_H "helper.h"#define HELPER_H "tcg/helper.h.inc"#' \ $(git grep -l 'define HELPER_H') then manually updating files in include/exec/ and docs/. Signed-off-by: Philippe Mathieu-Daudé --- include/exec/helper-gen.h | 2 +- include/exec/helper-proto.h | 2 +- target/alpha/{helper.h => tcg/helper.h.inc} | 0 target/arm/{helper.h => tcg/helper.h.inc} | 0 target/avr/{helper.h => tcg/helper.h.inc} | 0 target/cris/{helper.h => tcg/helper.h.inc} | 0 target/hexagon/{helper.h => tcg/helper.h.inc} | 0 target/hppa/{helper.h => tcg/helper.h.inc} | 0 target/i386/{helper.h => tcg/helper.h.inc} | 0 target/loongarch/{helper.h => tcg/helper.h.inc} | 0 target/m68k/{helper.h => tcg/helper.h.inc} | 0 target/microblaze/{helper.h => tcg/helper.h.inc} | 0 target/mips/{helper.h => tcg/helper.h.inc} | 0 target/nios2/{helper.h => tcg/helper.h.inc} | 0 target/openrisc/{helper.h => tcg/helper.h.inc} | 0 target/ppc/{helper.h => tcg/helper.h.inc} | 0 target/riscv/{helper.h => tcg/helper.h.inc} | 0 target/rx/{helper.h => tcg/helper.h.inc} | 0 target/s390x/{helper.h => tcg/helper.h.inc} | 0 target/sh4/{helper.h => tcg/helper.h.inc} | 0 target/sparc/{helper.h => tcg/helper.h.inc} | 0 target/tricore/{helper.h => tcg/helper.h.inc} | 0 target/xtensa/{helper.h => tcg/helper.h.inc} | 0 target/alpha/translate.c | 2 +- target/arm/tcg/translate.c | 2 +- target/avr/translate.c | 2 +- target/cris/translate.c | 2 +- target/hexagon/translate.c | 2 +- target/hppa/translate.c | 2 +- target/i386/tcg/translate.c | 2 +- target/loongarch/translate.c | 2 +- target/m68k/translate.c | 2 +- target/microblaze/translate.c | 2 +- target/mips/tcg/translate.c | 2 +- target/nios2/translate.c | 2 +- target/openrisc/translate.c | 2 +- target/ppc/translate.c | 2 +- target/riscv/translate.c | 2 +- target/rx/translate.c | 2 +- target/s390x/tcg/translate.c | 2 +- target/sh4/translate.c | 2 +- target/sparc/translate.c | 2 +- target/tricore/translate.c | 2 +- target/xtensa/translate.c | 2 +- 44 files changed, 23 insertions(+), 23 deletions(-) rename target/alpha/{helper.h => tcg/helper.h.inc} (100%) rename target/arm/{helper.h => tcg/helper.h.inc} (100%) rename target/avr/{helper.h => tcg/helper.h.inc} (100%) rename target/cris/{helper.h => tcg/helper.h.inc} (100%) rename target/hexagon/{helper.h => tcg/helper.h.inc} (100%) rename target/hppa/{helper.h => tcg/helper.h.inc} (100%) rename target/i386/{helper.h => tcg/helper.h.inc} (100%) rename target/loongarch/{helper.h => tcg/helper.h.inc} (100%) rename target/m68k/{helper.h => tcg/helper.h.inc} (100%) rename target/microblaze/{helper.h => tcg/helper.h.inc} (100%) rename target/mips/{helper.h => tcg/helper.h.inc} (100%) rename target/nios2/{helper.h => tcg/helper.h.inc} (100%) rename target/openrisc/{helper.h => tcg/helper.h.inc} (100%) rename target/ppc/{helper.h => tcg/helper.h.inc} (100%) rename target/riscv/{helper.h => tcg/helper.h.inc} (100%) rename target/rx/{helper.h => tcg/helper.h.inc} (100%) rename target/s390x/{helper.h => tcg/helper.h.inc} (100%) rename target/sh4/{helper.h => tcg/helper.h.inc} (100%) rename target/sparc/{helper.h => tcg/helper.h.inc} (100%) rename target/tricore/{helper.h => tcg/helper.h.inc} (100%) rename target/xtensa/{helper.h => tcg/helper.h.inc} (100%) diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index f7ec155699..ca8d82d99a 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -9,7 +9,7 @@ #include "exec/helper-gen-common.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/include/exec/helper-proto.h b/include/exec/helper-proto.h index 6935cb4f16..4d9014e9aa 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -9,7 +9,7 @@ #include "exec/helper-proto-common.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/alpha/helper.h b/target/alpha/tcg/helper.h.inc similarity index 100% rename from target/alpha/helper.h rename to target/alpha/tcg/helper.h.inc 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/avr/helper.h b/target/avr/tcg/helper.h.inc similarity index 100% rename from target/avr/helper.h rename to target/avr/tcg/helper.h.inc diff --git a/target/cris/helper.h b/target/cris/tcg/helper.h.inc similarity index 100% rename from target/cris/helper.h rename to target/cris/tcg/helper.h.inc diff --git a/target/hexagon/helper.h b/target/hexagon/tcg/helper.h.inc similarity index 100% rename from target/hexagon/helper.h rename to target/hexagon/tcg/helper.h.inc diff --git a/target/hppa/helper.h b/target/hppa/tcg/helper.h.inc similarity index 100% rename from target/hppa/helper.h rename to target/hppa/tcg/helper.h.inc diff --git a/target/i386/helper.h b/target/i386/tcg/helper.h.inc similarity index 100% rename from target/i386/helper.h rename to target/i386/tcg/helper.h.inc diff --git a/target/loongarch/helper.h b/target/loongarch/tcg/helper.h.inc similarity index 100% rename from target/loongarch/helper.h rename to target/loongarch/tcg/helper.h.inc diff --git a/target/m68k/helper.h b/target/m68k/tcg/helper.h.inc similarity index 100% rename from target/m68k/helper.h rename to target/m68k/tcg/helper.h.inc diff --git a/target/microblaze/helper.h b/target/microblaze/tcg/helper.h.inc similarity index 100% rename from target/microblaze/helper.h rename to target/microblaze/tcg/helper.h.inc diff --git a/target/mips/helper.h b/target/mips/tcg/helper.h.inc similarity index 100% rename from target/mips/helper.h rename to target/mips/tcg/helper.h.inc diff --git a/target/nios2/helper.h b/target/nios2/tcg/helper.h.inc similarity index 100% rename from target/nios2/helper.h rename to target/nios2/tcg/helper.h.inc diff --git a/target/openrisc/helper.h b/target/openrisc/tcg/helper.h.inc similarity index 100% rename from target/openrisc/helper.h rename to target/openrisc/tcg/helper.h.inc diff --git a/target/ppc/helper.h b/target/ppc/tcg/helper.h.inc similarity index 100% rename from target/ppc/helper.h rename to target/ppc/tcg/helper.h.inc diff --git a/target/riscv/helper.h b/target/riscv/tcg/helper.h.inc similarity index 100% rename from target/riscv/helper.h rename to target/riscv/tcg/helper.h.inc diff --git a/target/rx/helper.h b/target/rx/tcg/helper.h.inc similarity index 100% rename from target/rx/helper.h rename to target/rx/tcg/helper.h.inc diff --git a/target/s390x/helper.h b/target/s390x/tcg/helper.h.inc similarity index 100% rename from target/s390x/helper.h rename to target/s390x/tcg/helper.h.inc diff --git a/target/sh4/helper.h b/target/sh4/tcg/helper.h.inc similarity index 100% rename from target/sh4/helper.h rename to target/sh4/tcg/helper.h.inc diff --git a/target/sparc/helper.h b/target/sparc/tcg/helper.h.inc similarity index 100% rename from target/sparc/helper.h rename to target/sparc/tcg/helper.h.inc diff --git a/target/tricore/helper.h b/target/tricore/tcg/helper.h.inc similarity index 100% rename from target/tricore/helper.h rename to target/tricore/tcg/helper.h.inc diff --git a/target/xtensa/helper.h b/target/xtensa/tcg/helper.h.inc similarity index 100% rename from target/xtensa/helper.h rename to target/xtensa/tcg/helper.h.inc diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 1f7dd078d8..291e09640d 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -30,7 +30,7 @@ #include "exec/translator.h" #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 13c88ba1b9..75db6960cd 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -29,7 +29,7 @@ #include "cpregs.h" #include "exec/helper-proto.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/avr/translate.c b/target/avr/translate.c index ef2edd7415..0bfa217d95 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -30,7 +30,7 @@ #include "exec/log.h" #include "exec/translator.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/cris/translate.c b/target/cris/translate.c index 1445cd8bb5..89e9f3ee36 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -37,7 +37,7 @@ #include "exec/helper-gen.h" #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 708339198e..cf95de7314 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -33,7 +33,7 @@ #include "genptr.h" #include "printinsn.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/hppa/translate.c b/target/hppa/translate.c index d33813d173..f6b531166c 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -29,7 +29,7 @@ #include "exec/translator.h" #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 5cf14311a6..695b88e992 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -34,7 +34,7 @@ #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/loongarch/translate.c b/target/loongarch/translate.c index 3146a2d4ac..056d20334f 100644 --- a/target/loongarch/translate.c +++ b/target/loongarch/translate.c @@ -23,7 +23,7 @@ TCGv cpu_gpr[32], cpu_pc; static TCGv cpu_lladdr, cpu_llval; -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 551ef9e52a..559cf46920 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -34,7 +34,7 @@ #include "exec/log.h" #include "fpu/softfloat.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 7e7f837c63..564fcda876 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -31,7 +31,7 @@ #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 74af91e4f5..e884faf22f 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -32,7 +32,7 @@ #include "disas/disas.h" #include "fpu_helper.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/nios2/translate.c b/target/nios2/translate.c index a365ad8293..c9649fc5c8 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -34,7 +34,7 @@ #include "qemu/qemu-print.h" #include "semihosting/semihost.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 7760329e75..152f93dec5 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -34,7 +34,7 @@ #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 37fd431870..b20f3316aa 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -41,7 +41,7 @@ #include "qemu/qemu-print.h" #include "qapi/error.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 933b11c50d..a2d25052b3 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -33,7 +33,7 @@ #include "instmap.h" #include "internals.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/rx/translate.c b/target/rx/translate.c index 08cabbde61..fdc091a2f4 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -28,7 +28,7 @@ #include "exec/translator.h" #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index a6ee2d4423..b6872ec7d8 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -45,7 +45,7 @@ #include "exec/log.h" #include "qemu/atomic128.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 49c87d7a01..93d038fc93 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -29,7 +29,7 @@ #include "exec/log.h" #include "qemu/qemu-print.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/sparc/translate.c b/target/sparc/translate.c index bad2ec90a0..45dc59f9a8 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -33,7 +33,7 @@ #include "exec/log.h" #include "asi.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 8e4f99478c..165a40c333 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -33,7 +33,7 @@ #include "exec/translator.h" #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index b7386ff0f0..969b51ac07 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -45,7 +45,7 @@ #include "exec/log.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H