From patchwork Tue Mar 11 19:57:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 872495 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1660977wri; Tue, 11 Mar 2025 12:59:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwVJT3zXhIUqOe/Py0jbR3cJxggjgsy0bpIFKl7vPPRg/uqm8uqrB3BWx+QADaFE7yUzziLw==@linaro.org X-Google-Smtp-Source: AGHT+IH7yhB5tg31L3HNf5+Yv8vvqGnqFzWzAeynhVR0z++Y7snxfCRs/qaBTFSMz+7Al0T3g97b X-Received: by 2002:ac8:5f53:0:b0:476:7a9d:d1e8 with SMTP id d75a77b69052e-4769948c84dmr55632591cf.7.1741723150690; Tue, 11 Mar 2025 12:59:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741723150; cv=none; d=google.com; s=arc-20240605; b=P64R8QJ7oY7spLx47m3o5JMf1c/+f38kj/SQMQ1QpPsaowyVr4y57m5Jlt4MBEgHbD jVocXjJMk2sLCfCPNBkowtYDE6JjxQYgLTxvSnd6T8UimCt7vPrdfH0NZtHAf0jPB9g2 rB4NJzkcmylXIy3AthHV6TpGzZNa0d53g6SEEV6sYBVPaduj+toqKYf4z3cFguktpa8e tpSNdPk1WsRDVbEeSYKWi+6jqklWMqP6smQut5vD+WcZd9DhSk/LhcTuTmcjlmkMpsvb /NJz0RPg4dOj4V6QYWns7X+r21bdEbMkRZ+s3e3NCAKM8wm94hskbbCrFkst1np6POhd SKWQ== 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=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; fh=kEoQpoDeYKqqTWMOc0Iq2e1LPI+fIsbUMg+I80Y/mck=; b=WnTQnexkjz5Tswm8qG5yPM5narYPv1qZOscIzIW24A2jBnUpuH+WEIdDgZwmIVYkFs QzYrhqUT3LW9Jw+YeZqY1hhuAJsUqogyK0r2Gu+jckqlcP009QUh1/9vHNeICC9h+sGP cEksnl/p9GmKtNA9w/4vB+S1yuiCNlSwBZlIL/QlQf+jmL/Gh03+FfjH91kqgSByN2Se 98ut1TQQfHh00auKM7s1/zpnRiyK6vz0omad3BjwHjSluyhumufuPEPGKVcvs/7su7iW pmwFehmtAt6CayD3lKu+r0oCHK4IL/Urux1L4OxoUxBFNuUuFarccOsOnZUjKYvyGfqf 9CuQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qXSvW74T; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail 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 6a1803df08f44-6e908565ca5si79150536d6.59.2025.03.11.12.59.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 12:59:10 -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=fail header.i=@linaro.org header.s=google header.b=qXSvW74T; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail 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 1ts5kT-00019R-5X; Tue, 11 Mar 2025 15:58:46 -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 1ts5k4-0000ui-2C for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:21 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5jz-0008Uo-9A for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:18 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-224341bbc1dso80068155ad.3 for ; Tue, 11 Mar 2025 12:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723093; x=1742327893; 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=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=qXSvW74TXMHWe5B3u8k2K5gnNH+47FieHotfR58ZnpPOPtCgKqsGqSI20DsruirDjB UlQBFusiwI0xGs8Hq1WsXfQJHBTVZGxL4VuIMKLm70IMAzuYHSpEmhTanyBFWg1IoPRM Q3TAn7Dlzgz0zhvv+2thepyhQBjTRCHvbZD5X9eIgvfMxrc9XJfGnfN/0DgYu3ufiPGo 32JHrv58Qz2MfPe72nM9REO+yMzIvpyzBNIQJaQzknyB4PJHFKLPo+mPHgmn9fTDQ/Hd JBTpw0pnKPe9caXaNklNw5MzSyqN+FMA9gRuTHjC2Bbn/AApJ1+NX+vw+ZyZyaULUvtX yQ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723093; x=1742327893; 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=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=eZcJpiD5iZ9mKUsj0nH+LZSP3Ny6wBChhM7eN9bE1tNazhQ2XLNPS9d6f43lr2HDM8 gGAIb1Mly7ozZrBlZyybXYYMSY49gKq+bvmscXLqGYxXH5y95vjM/DGhxU0CRN5znRcw Cg6MUQ6FLrrnJ6k5HMswqeKIwCUk+53kxMpsM1vHY7EZOR9ljrm9615sQqV12dXpP1Yw 5K7jCkwgG1OYcmrzgOxlKvWLzLbVcXawaVXjqmR3L92sAem27SoDvjKxU9L4y/0nb8NL ToYXJ1A0zoGUjMAk1PyHKOaBIy9ICiZF5hRlAnJ04iJlgclMXYX7cfQMoTvrNODuajkc 8ovw== X-Gm-Message-State: AOJu0Yz1SpkAGnD6Y/NBMyZ/n225B4vQ6SpjNVNFT70AnVOsvLfH53wL 6NGqlZjYb+h3C2npmLW64QHnc2kJfvZgXadQ48EAKDkg8+LaMMDRrkwzdCiJXHlmhHDlpAuEnHw LcyM= X-Gm-Gg: ASbGncumpXkKnXzhMZa/oXKFz+aHQzpL356kfiq8tmpVno/3VywyCky0t7Yl4GtSjhk Hp6o76Hin6QO9nGjMnU4Fu2gb9iwmvnLX8fyUV9URd27ERkXhA30piVnsaN7l8tuxCLedzCi+Z/ LlntbRCVboqzQUCbWTfud5JzMkNMkV+cby2iGMkFL7TCfDEgnXmiR9FninAXAtz8/yzLA3Iy85W 6uugE7urSMKSJ3IvbISvgNTj0lgabd+Kwotqj+qn+1hOcByMq56VmQkyzMgz3ic5GvQiWi9ViwE Et0RHWXfzLo1ZzHfa1cgS6QSXqjdxBJmgwfduOI36cJL X-Received: by 2002:aa7:8892:0:b0:736:a540:c9ad with SMTP id d2e1a72fcca58-736eb8a17b5mr7090307b3a.20.1741723093074; Tue, 11 Mar 2025 12:58:13 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:12 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 02/17] exec/tswap: implement {ld, st}.*_p as functions instead of macros Date: Tue, 11 Mar 2025 12:57:48 -0700 Message-Id: <20250311195803.4115788-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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 Defining functions allows to use them from common code, by not depending on TARGET_BIG_ENDIAN. Remove previous macros from exec/cpu-all.h. By moving them out of cpu-all.h, we'll be able to break dependency on cpu.h for memory related functions coming in next commits. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */