From patchwork Wed Mar 19 13:45:03 2025 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: 874733 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp408928wru; Wed, 19 Mar 2025 06:50:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+WnI2/7PIEIeJWdmXmVx8GbfWoBiS7Bm375RvhX6nB5DfUr5/YZu6xxd3Pa8Mfn2RtGCZ7g==@linaro.org X-Google-Smtp-Source: AGHT+IH2p+gqX9Nhv0Nxi9VEaxVs/zZKwW1XaBWITI+sWKfW4brHIdkphEmEjs/WHx1G2jW7Cb0f X-Received: by 2002:a05:620a:c4b:b0:7b7:142d:53a8 with SMTP id af79cd13be357-7c5a7daca21mr374615585a.19.1742392230162; Wed, 19 Mar 2025 06:50:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392230; cv=none; d=google.com; s=arc-20240605; b=W33jv5Z0ClLsOA7FUo1Ve7dT/f8Wu+qQTmzu9Hwtou2RJix2Q7OVlM4CPeJsl9b5oJ 0N+JEoobpjyJN/E44TnFvyUeUBw9XEvN52qDBZb4/dwlrYwsFDE3etj7qKVkUxsVXNU8 PMpO3LY080efzhYKPrCioZmts9FsQaHOxYd++twXrM1Jo5nckQF0Mu8EeOznJwB3Ah4B HXLar0y00G+A8iHzwAdIJc96hMXXYRZ8I+AsI1wTXg2iMN59tf/hu4lBrR4iR+itKxVe J/B/io6/pTvT56ECZkPzot1+8uCucq70/OFEEg74oZJnGNgCYwtgpeHQ7Gkz5XW7tot/ U9TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=0iduta05yw16WNoxlZ2Qk6hI45690lcV/AnGwn0ABIE=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=NAgRiCr6LqncJMnpiRypwyvjI/nBU7KyH4X37AAN1kAQJ43hRcpD/QIG9PIdWMb0zJ tWwyx3Y9QzS6bU7JP/HMPizxJA6e6OCeQ5l3XwqJ1i99PZmQLBWr/zQ8he/jSNgOjkll 9mMIx3MYPiuSBYPh8sGeH5JaKHqPkdMGTQBvRR346esyidJoBq875XBO5ECnX3BMoxhj 3em9roPX551b6Qi/pywOqP9J4L3OGUzubO2fU+Gxhd/jlLi85+vjgu9fVOZh80/7XfRz tHAPg2KfGHey7xHAo9bnnZcKBzCsByUkNfNxBCkELdAuG9VD9/rFPNjatoatCLzaWWqC z2Ww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BVsuNliA; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c573b97fecsi1359194885a.148.2025.03.19.06.50.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:50: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=BVsuNliA; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tutl4-0004cU-Gr; Wed, 19 Mar 2025 09:46: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 1tutk7-0003ZO-Fb for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:02 -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 1tutk3-00044x-Bj for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:57 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso24294485e9.0 for ; Wed, 19 Mar 2025 06:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391953; x=1742996753; darn=nongnu.org; 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=0iduta05yw16WNoxlZ2Qk6hI45690lcV/AnGwn0ABIE=; b=BVsuNliAPBphT3Dl8o7GtdtkP4UfN3kV3qStr/lg/so4InV3/mp5M8gM3/MHYWdCO2 9RAIHsOWkVHpRiMZChzrdI58hAbmMtd222Shh74uaCcbmlXuNkkYytVs4nz6yjdgok9K ozn+bIXSzIady2ULbhCT1FAvP+TgqoqK9zDIFnbSDEDlvPWMrLXR3lOI+obmGCkzUR+b vDj1sDwnEgEoWDfC0WWwi5u9aX4Fibv4cwyMkKsb7Ja5eZhkVfstIAOF67rRsuGyfvkd FU0OC5WWnX9QtGnETaFbUBoFGJRo/NoYRTLyMFNQK3i695JjIBVNDFfWcE3TuQiM+G1Z FOFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391953; x=1742996753; 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=0iduta05yw16WNoxlZ2Qk6hI45690lcV/AnGwn0ABIE=; b=UR96pmzKsDv1Amw5QOBxbzVoOZbpNMm1FMGRzol00GVqbdijjuVKkiUSj39SWzGIqs 9Ht3pPU76peCEh0d4qKziVZhITcpiodmguCdkorOVA7CdxeA4cwuds6Yd1qa81HU1sRo aq4u8+B5hPhsI2Gv9rtMNG16NEzh29W9wtCrD9ziSQ19MKLlKiYUrFUMpISxLjeLdaBG /Wf6s27lG3kXpnhOU4WVc5lNfoHqI0ePaNVVq5sNKHloqEHKt7rVxhjgWvcZZrGstWhx pNXgEtTbmHKXSaIqFZdTMfbJAExmKJX3ajnXlXRnYg+2jTwvkcNSQNIMJr6F2kogHgHy 3jwQ== X-Gm-Message-State: AOJu0YxJtvqaWnTi8fC13ZQDRXoNDgoFvbmRDfohQB7rEVXtxrRAye6I /iR3ijqeWEdTmouwnQjJ4g7G0ATyKq0LtFTm0vK69fTrqCwSPU3EjyQnjUJT3vqMfKu4oJFVk5U i X-Gm-Gg: ASbGnctIu0nWCmcnuAf+2H6tFcN7V5e5CKTMhcYsNRqCDu0O0MQSczPMBmzlwH7rTDe 1CLW1xCPFgxWx3S/r5vsphVjoacCP8AS1UM756vYzMUT/69Lwx//Oy5UXR2gJhsypqeYxO4863w +oXbcUbLAEWWBZheIk4jebMlhyxM14JpOiknysCTlsRiLgUf/2FqYYMP8EdzNgbi1RGs1d7IF2o hOcF9P+KIoNzBvgMriUUdyMJDSv8dAOF6OuZBCQ9znqEaSRFIhHbr/Q98IuEM6LKGFPQcTTOpWR GXLMkK7SxDsppYWmbAWAey1fZVwdWPxbvGItqL8RteKVe/HMz+3X0oGb3YkvN2S8KfBPAluSHDG g71dF2ZP+7O8NxGLv7Pw= X-Received: by 2002:a05:600c:1da9:b0:43b:ca39:6c75 with SMTP id 5b1f17b1804b1-43d43793160mr29149685e9.16.1742391953364; Wed, 19 Mar 2025 06:45:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f864d4sm19661645e9.37.2025.03.19.06.45.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Anton Johansson , Peter Maydell , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH-for-10.1 09/12] tcg: Restrict TARGET_INSN_START_WORDS definition to translate-all.c Date: Wed, 19 Mar 2025 14:45:03 +0100 Message-ID: <20250319134507.45045-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250319134507.45045-1-philmd@linaro.org> References: <20250319134507.45045-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 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 TARGET_INSN_START_WORDS is now only used within translate-all.c, move its declaration there. "tcg/insn-start-words.h" header being now empty, remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/insn-start-words.h | 13 ------------- accel/tcg/translate-all.c | 3 ++- target/i386/helper.c | 1 - target/openrisc/sys_helper.c | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 include/tcg/insn-start-words.h diff --git a/include/tcg/insn-start-words.h b/include/tcg/insn-start-words.h deleted file mode 100644 index 394c191da8d..00000000000 --- a/include/tcg/insn-start-words.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Define TARGET_INSN_START_WORDS - * Copyright (c) 2008 Fabrice Bellard - */ - -#ifndef TARGET_INSN_START_WORDS - -#include "cpu.h" - -# define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) - -#endif /* TARGET_INSN_START_WORDS */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 2f8cf6db144..fc55a75a3cf 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -65,11 +65,12 @@ #include "internal-common.h" #include "internal-target.h" #include "tcg/perf.h" -#include "tcg/insn-start-words.h" #include "tcg/tcg-op.h" TBContext tb_ctx; +#define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) + /* * Encode VAL as a signed leb128 sequence at P. * Return P incremented past the encoded value. diff --git a/target/i386/helper.c b/target/i386/helper.c index 90e113c8b5a..1f819fbff65 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -30,7 +30,6 @@ #endif #include "qemu/log.h" #ifdef CONFIG_TCG -#include "tcg/insn-start-words.h" #include "tcg/tcg.h" #endif diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index cf521461954..9da2bebbd5b 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -27,7 +27,6 @@ #ifndef CONFIG_USER_ONLY #include "hw/boards.h" #endif -#include "tcg/insn-start-words.h" #include "tcg/tcg.h" #define TO_SPR(group, number) (((group) << 11) + (number))