From patchwork Tue Dec 12 12:33:59 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: 753078 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c83:0:b0:333:3a04:f257 with SMTP id z3csp1877109wrs; Tue, 12 Dec 2023 04:39:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGxet6HXD/AVrZRTun4y8dmj47yZfsG/4cMpa5dJicfrtAUO/NrbzMNzxw4u+T6LvcSLw9R X-Received: by 2002:a05:620a:24d1:b0:77f:3b08:ea6f with SMTP id m17-20020a05620a24d100b0077f3b08ea6fmr8609274qkn.117.1702384754000; Tue, 12 Dec 2023 04:39:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702384753; cv=none; d=google.com; s=arc-20160816; b=IX/IGHBdLIIzJHChk+f3KgNBg5e5EsjuNgLR3NpXnIQ6/m8DI46GToJVjtFWjkdxgz AL4PGw/kG7vNwhxL9NsmDenAI3sGfUwcmY349w6v50DLy3MnxlPo2bIVvieq30vw5TP0 gtUMzlB3Mla6z0vjPeeopMpoTxnt8k2JDPU9Yox7BlxQHqaGuOF53qUoxlmAEYjvQIwp zM58UGzQDZF5LQnUlGSb7VLARwg0S/+LSs5EwJbptLd4USLEp8JAdyitAduO0Cv1SMFQ sK/EPghq0Ry1k6nH05od6ZxvXyDO2pYQ3gLl+CF7T2f40VRvVq9AtYPOlIEEhT5MZ8XT dgvQ== 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=QFKe5fpokVIiAkSRFD2bRfU4SaX29W1o3RfhIDFCgNg=; fh=vlFEGdij83GYetLrOUaCnR04sbYRvtckD5L7fw5192c=; b=vv12gRW6yGtOotjKeH4j8EDbZX1lA66eE1g7SN3/nwQzx3zYc/tvZ7gt6XnrOqY87y O3wfdE3PENpYj9Dk4yIjDz79rLSTdf9Rw7T3UQN9cHq2tiXgn8Qg7tzitHmfXbtiCVJu kw+MKwIcr4EDWezfAiBqpg8JjqrI3QOMKmGoxOfrtqgc3XkiuNkA4Jg8ppNo496a1TXp HKuDBk1WdgtLMDEv07AeCsW49+dOGdBmsPnBRwA3R0pJWVnUbe9wcaK2Oeu9yiwbVoNm nAR8QHfXy7VxjXWp8Y+tYlIodccXuiR9Gz2GOMvkPagofT1RN+sP79GvL9R0H2FIiYTX JYoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nfS3inKe; 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 bm17-20020a05620a199100b0077f0eccc137si11412712qkb.295.2023.12.12.04.39.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Dec 2023 04:39:13 -0800 (PST) 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=nfS3inKe; 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 1rD216-00064x-JP; Tue, 12 Dec 2023 07:37:40 -0500 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 1rD20V-0004Eo-Du for qemu-devel@nongnu.org; Tue, 12 Dec 2023 07:37:05 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rD20Q-00010M-6V for qemu-devel@nongnu.org; Tue, 12 Dec 2023 07:37:01 -0500 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a1c7d8f89a5so745905566b.2 for ; Tue, 12 Dec 2023 04:36:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702384611; x=1702989411; 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=QFKe5fpokVIiAkSRFD2bRfU4SaX29W1o3RfhIDFCgNg=; b=nfS3inKesmoFelJzRAw5nE15vupRo/3PcngAdug8VbsoS7XI3T8uV4pxlLeqSOske/ KxRWrP5Fus8ygyYuVcDgS4IqJaCK78hyVoB6bDWuoKS1qS4Sqqy/hKDlxAvQYGYBjIIE nL4eHNNAglSE0px4cuOTurU1wxY62bUuGS0UOqH0fCy8xmIdglOTzpUs9cU+dreyeglt NS4C0gLG7f63qo0Fhs66ZIPHKoJ2xfOClCenge+9bSNVRAFiJ8SlA8etzY885KKxQlej TEs6ZjHhYXqKHJl/Bb3aeS4Yssx1kBsZG1md3DFSCooBbsag5wKxeEsW4C6J7erIOf/x YdVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702384611; x=1702989411; 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=QFKe5fpokVIiAkSRFD2bRfU4SaX29W1o3RfhIDFCgNg=; b=a+Qg89YAQ+7mZDeB9Z4/NtRXKcAg/9gWcj+bW08SMinXi59C+K0MNwUDro/iMyh9ez 6o3UJPr5WqwwSSinwGYtEdRyh55kNWjGZP0B/aQh8tcLhraTu1AEh2uXXkit7BdMlwYj rbvk1aM+jNYxylfdKRR5vXzcxwDJELWR0cnImPQFmmSE/Vmnc70fu1wmNUbTAjvD5osQ ZezsQSp1w/9qmUXLRpqrdnvv9Dr/DWiwgW15u/heyFWXmFKYYPBfbYBlivUZSBgoqmjY y7MEwGbTBVdlnH10TEjxBlJyE2zMbTsKvv4g1I5rvRGN58kytXg+tkqU/0JShvHQbCsE ABqg== X-Gm-Message-State: AOJu0YwbaKMtOBq429TE/40tXNE6YPERR7fvgQyOiVMnSCNYO/xrLe/e iYJIHvoKFUhYpap7SK1eEtAUNS5Wztmt2hiefpIBbw== X-Received: by 2002:a17:907:7251:b0:a02:54fa:4f2f with SMTP id ds17-20020a170907725100b00a0254fa4f2fmr3683854ejc.53.1702384611672; Tue, 12 Dec 2023 04:36:51 -0800 (PST) Received: from m1x-phil.lan ([176.176.175.193]) by smtp.gmail.com with ESMTPSA id tk3-20020a170907c28300b00a1cd54ec021sm6243423ejc.57.2023.12.12.04.36.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Dec 2023 04:36:51 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Claudio Fontana , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Richard Henderson , qemu-riscv@nongnu.org, Brian Cain , Thomas Huth , Paolo Bonzini , qemu-arm@nongnu.org, Manos Pitsidianakis , =?utf-8?q?Alex_Benn=C3=A9e?= , Anton Johansson , Warner Losh , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 23/23] exec/cpu_ldst: Avoid including 'cpu.h' Date: Tue, 12 Dec 2023 13:33:59 +0100 Message-ID: <20231212123401.37493-24-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231212123401.37493-1-philmd@linaro.org> References: <20231212123401.37493-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=philmd@linaro.org; helo=mail-ej1-x636.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 "exec/cpu_ldst.h" doesn't need to huge "cpu.h" header, but simply: - exec/cpu-defs.h (TARGET_LONG_BITS) - exec/tlb-common.h (CPUTLBEntry) - exec/user/abitypes.h (abi_ulong) - exec/user/guest-base.h (guest_base) - exec/cpu-all.h (GUEST_ADDR_MAX and env_cpu) Signed-off-by: Philippe Mathieu-Daudé --- env_cpu() will soon be removed from "exec/cpu-all.h". Do we want to move GUEST_ADDR_MAX declaration to "user/guest-base.h", eventually renaming it as "user/guest-addr.h"? --- include/exec/cpu_ldst.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index e039cc7f80..ec0784bf15 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,11 +65,14 @@ #include "exec/memopidx.h" #include "exec/abi_ptr.h" #include "qemu/int128.h" -#include "cpu.h" +#include "exec/cpu-defs.h" +#include "exec/tlb-common.h" #if defined(CONFIG_USER_ONLY) +#include "exec/user/abitypes.h" #include "exec/user/guest-base.h" +#include "exec/cpu-all.h" #ifndef TARGET_TAGGED_ADDRESSES static inline abi_ptr cpu_untagged_addr(CPUState *cs, abi_ptr x)