From patchwork Thu Apr 24 00:47:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883770 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3197948wrs; Wed, 23 Apr 2025 17:51:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjhk7iFP75Fh157QwJC1tbteYQacc6+AayvwohygILW4EK+/5Ce3zSqNz9XwFTY+rsxYtXAA==@linaro.org X-Google-Smtp-Source: AGHT+IFwpmb/I8lpKWRhxcKu7aGY2g8WBZDBQ+2ImDMRbIbFAuSZops9dw71MxdeuYgoFbMfku1/ X-Received: by 2002:a05:620a:44cd:b0:7c5:4de8:bf65 with SMTP id af79cd13be357-7c956f3ff8bmr171308785a.36.1745455866782; Wed, 23 Apr 2025 17:51:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745455866; cv=none; d=google.com; s=arc-20240605; b=UA+nF210i75XuZ1BqQlii8ZJqjeUUVFfbsZ/ZFZVuHPuJn7rEI4olSMS/GBXEMIJ2R ZoD2Lk6zXnhX+QVjFDc99ZsmFIgcxAFvGkz5p8XtGXmQjudaAghJ9XcwWPPKI0zk9car XNcaKvzTBASXK22AoTFvVmsm9H526sT3T2F/rVd5pSEF3DuTg/dGNX/Ihjm+Qp/zG+hG FsGtlJZ3/rMlFK4GzO529WVm8/s75kSQQQL+hE2qTL+L1lUtBdSKjjqFE6/yVEhqel1K JnQ3jCc7pR3bc6zDPnhuCd27Ux5zVaaIVQbv1DiB7l1QG1++w/AepLQazO0byi1/7nP2 X/WQ== 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=a3Pmx2FLEZ9kjbt+cSL6Q/1nXndHvzQCpATDx6amJMg=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=irF2wiSSjVkZaRq58tvdt0BoQtLBzvtfIn98kCOZmsiMWQmf/nlQ8zexsjxZ0EDYos JvO7kgbgdX6OY9DJmMPAzB0WE+l+MYx+pGMefgzQy82z+8x8o6oeM3iv5C5h0aXQhhtd BlLn4mghK18JjasxQuYsBIfnRq4U06T9jxbxYEEPG3Yiec9chNVbdBEHfXpSdnmZHKy/ EnpdLKrnjHQgQvuFkTNdVv0ZpOKtbKzYXP3JDfz49gieEWAL3UK8+uFMtTz49pNFvLJL 4woQN5Hr8lZ3jrQaXpTU9z3dJE4zeb14ZANcLRgo3B/zRF4nUIWNtMuhHgWntCOsbQFe D2tw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xa+C12CU; 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-7c958c9b75csi20343785a.106.2025.04.23.17.51.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 17:51:06 -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=Xa+C12CU; 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 1u7kmg-0005Ap-W6; Wed, 23 Apr 2025 20:49:47 -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 1u7kmd-00058C-E5 for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:43 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kmZ-0004IE-UX for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:43 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso385075b3a.0 for ; Wed, 23 Apr 2025 17:49:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745455777; x=1746060577; 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=a3Pmx2FLEZ9kjbt+cSL6Q/1nXndHvzQCpATDx6amJMg=; b=Xa+C12CUcKKHh+5ijwXnHNyy5Mkn12/7Gf/9Vn/+AZP68dlQ5Ydj8DH607S8syoSLk 6uEE8U3fnxMEz0ra2nVKNQ9nGMq8K1q7ik0C4uaIlrZmVCRmU2Jq1l60y9HZpgYNTV7N Ocl3wLQtG6+SPkjMTfBQqMF8BAosMa1kZGHn4HxUozyFPaSlnk9CcI7sbtDfm1yjoHf6 qqB6MMK0yKlyOoutbEaPcu7o8PHtoVOvXHaaxCivvhimCZx0ASof9U2hFV6X3WF8R3OW Io5FOUh53ttZZgA0quDO1xlBx/zmKwhN8nFeay8osWiYbM/3mUVeCF1B6OUo0hpyk0VC G+xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745455777; x=1746060577; 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=a3Pmx2FLEZ9kjbt+cSL6Q/1nXndHvzQCpATDx6amJMg=; b=TURsMg/tIogb5+2qS1U0mDht0vjsKdpdoxlOEurEKjRYyXbj37y021qWQUbAR+H9Tk VCQuOCFqdbPfx9aLbdl4xNwhS41/7s45h40dsvtPHSKIoMAT0wo575i0l0J7pPHezszC /YvNa7JWBuo1balYfIvyQtGS2y1om+Xm/qWl/YkuL/bE+iAbGeGr4bRjhfRuSjTQp5vO dLU7y7igYjYR/JD1rnFeeJD/iVNF1KRKzZNFJ8FNzxjMiFaTb1H9E0DicDNSSmp/hySR 5uiMYMJDjJFJNZ349qfFPMtcR/V/vrkJVQF1cOELY/6hy/wW9dp0flQ1J+3svLHI7dKU 21vQ== X-Gm-Message-State: AOJu0YxT6zJk9r5oCLg0gwkXXVNS2bgx89J4SybxKsjoRER0qpcrTiuy mTGD9YW6R6BiT7UHgDYizTxaDzbdoQRtMMQdelr6lnU50pxyfSeWUdt4urOLcMqdqJPuyGsVFcX 3 X-Gm-Gg: ASbGnctdEPdUyKD/5gew9Ismaa9NoU1pUW8y7755k0MQBbbgVLzvcfyH3vBddN8vZD5 eE69afJMiVeFU81UCfmFhaqENrDe3Y6aa+EXCWiPD+HKrmYysf05x2QF0U+VgPL9IUZQI4Rbnwr +vxFE6Urq44+mxUVlszqZgIGkvl0N2BVlTC5nvE25JyTWiPLJmwVXVslNrAuo9LuNO5XPubwpF8 +Xbsxlo445DcPbVJ+4QRT+cL0FCYTDzB7Y6GdxEZpbAEMQ1imvY0HqlXjcQ7koWagZiwlgWI0oG Y6AEAGbdCmq5ZfTK8OEI7csVH7Pn9kaC31M++oV/B/Ixw/oU6/qeUL6xHjQeoFk8ZObPBHpq/om Pitrbz9EvUA== X-Received: by 2002:a05:6a00:2d21:b0:736:a4ca:62e1 with SMTP id d2e1a72fcca58-73e2460543dmr1098954b3a.6.1745455777349; Wed, 23 Apr 2025 17:49:37 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a9a0f1sm207344b3a.137.2025.04.23.17.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:49:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 003/148] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Wed, 23 Apr 2025 17:47:08 -0700 Message-ID: <20250424004934.598783-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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 From: Pierrick Bouvier They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Signed-off-by: Richard Henderson Message-ID: <20250317183417.285700-4-pierrick.bouvier@linaro.org> --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index d000fe4871..7e8d66de31 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -32,18 +32,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e956..7270235c60 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS