From patchwork Thu Apr 24 00:47:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883768 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3197783wrs; Wed, 23 Apr 2025 17:50:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWF4N3RV35N94jWfyrS1I82TKZwDQihQcsxy46E0r/COVa8LNSmIJxt9bA9duZWHJjHpZKhnw==@linaro.org X-Google-Smtp-Source: AGHT+IHn1oDjWuqYpQJyzBD0HmSLwARu/Dtdwn6pcehfI49ABYdfa8J/DrrcWAPwl2rgWJXQnejb X-Received: by 2002:a05:620a:29d2:b0:7c5:59a6:bae2 with SMTP id af79cd13be357-7c956e7c5e2mr146976285a.4.1745455826019; Wed, 23 Apr 2025 17:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745455826; cv=none; d=google.com; s=arc-20240605; b=PjN+7JPkKfc4icqLoTaoWAl5rCH3+4Tmau2K/xnqrF98A2T/nl4oTpwaa7U9G2DQNy /HqT2O8+DFUxJYpWXbzcIj825rztikbE7G0h8tiKiWdpYpck81ZHTmUv63+jWp+sUrfR +FjfGqXEZSPI92EOHQqJ0/oyrhrheiavKX1aR2cF0CQ8f5LUm/3wGnVC3pnJRcK4fy/W iEO2OOhqcwlssXkYjzzmwLFX/rM5AFRGk2l/tC/fSX/7vicTHpLCl52sW/+lUtWMcg9h p6DQwknSaVg7TEu3YBBWY2poYT4d4dHJ0y7ju3hq6eWRYVl24d/Bhgs4UQt1VE+kBldC Mgtw== 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=7uAMrxInIp+C0jH/wHKgggSAeCetsGjpX7/pWD8kiro=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=CLpMFMOw84o1z6FDAuQq+b8BimLdvDrM3alm91pLNKChlgxbkh2c/Eu/WvA/HKSFDz zFoHUp1lEThENWlwUwLws6l3LsgGMYug872MRD5kULvPoGSkHx/Coqtg7E4kuRhtih57 k+3dCDiV9p29UowTd8GESPAjoZ82m5BKlPCAASZdA+ZRN4vG1bNhMbaiV1o3Eez1MaCg joqPjNTHv1NNpTQ7yCmLDaJcGMbTK89o57A2XySdegjqFxwEB90uzjdvS6nQlJ3sX60U HHMwGpWlcjf0PA7So095ogxDFO7dX9yk8MfBhHDKGokFwpCGXqm2LACThBuv1DzcCAzd xtOA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sl1aHJy2; 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 af79cd13be357-7c958eded9dsi17276385a.630.2025.04.23.17.50.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 17:50:25 -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=sl1aHJy2; 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 1u7kmf-00059T-NX; Wed, 23 Apr 2025 20:49:45 -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-00058E-Gq for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:43 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kmZ-0004IC-UZ for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:43 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-73bb647eb23so342991b3a.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=7uAMrxInIp+C0jH/wHKgggSAeCetsGjpX7/pWD8kiro=; b=sl1aHJy2iBl/Deyz9KU2wZUTokpRG13cXSIlsowy8nzqqAXwJPz9sLSXQe6S99vrbC o2sXmK2VU3srBjyq21AIOE0bXffBYrC2YqfXDDCH1IOUmvWVww9aGIF0/Dy0yrl1QJYe GEet3kSp0t08I/qjw7UVY2RSva2mSAY6Uy4SeGHaV9fc1XdHEStcBW3BxqS9cWH/hFY6 H9Xd4qDz+RgwYdqTBDWmJXsujUDe+o7ndY0v+2XBKfiJ0dXQx+uZGloyXn36t3enDShB bs4Y7T+csewoBSx9m+kRoeuqgF4Jya4U0hjyhO2LG/W3SUwjt9IondrfPpIaMoOwvPk0 nhTA== 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=7uAMrxInIp+C0jH/wHKgggSAeCetsGjpX7/pWD8kiro=; b=sFf1msKRJc8UNsa2r4HAdf4qBpJ3nfc1rfWCRtPcLar3WdJRS6XRKRQhGrZT15Ul8G Ma5dfH8Ij/r4clC3zkK6GnJcIBvwdqLmdHyHDY051XiWLlQIQbC93BDlSpw038sPv96r RS9xx4Oe6nHPUp3bKyIOkmKtO5cQXivpcdughO7b0rEDKJPE5CVmUrkgiIiY9psY/eCd fg9s7aqiBgDUSRMdKi8NT4C+IFQ2x2PtY85/VGxQ1kB2UsK+zUQN8QQjAe0NzLLO34al u1fpJX5oWfXVwTmyCJMCuCrbf3TANGPq0GMy73UHHagRZEsVPyrV1E07ucniaPQ4Ww+z AzIg== X-Gm-Message-State: AOJu0Yw9HAmYAizjqfjq1nnbTa0k70PfijF+KvcCymFSPf3fGUF8SkI5 xy089eRtCd0iF4M+tK7TXDv8QayM+mLnl8wwqc/ZJxlYu/S21nJg4lJtq+jcGtD4CoZUURLFvWq t X-Gm-Gg: ASbGncvvxtNewMlZjsF1J8qYhi3i9roKF7j1PcW4QmRX5LtK09p6BCFMT6C8FHbS5WK LoeBVLuOrehTFUN2AJ4he5w2gzH+X0o+zSgQtzwksf+0njk8zq+JN6jLVjNp8BoMSoWp95Y4psA RR2DDosFY1XdI27LUQQo4SyQSsUODbzUms8eRyrBoriicU8gNoM5/CS06fjcRrKP6TQ2EFUEtWo nEB/8jvdceiDXcOyTPa+60iuSQ8lABSJ0dWPd0SnMFUK8vK5Kzgs4tOSQhadS1/9yR7xsh6o5HW JmqdpZtrnqS26jm0DJePI34EpPYyVw1agUsXunfbmlBJ1PdpFead1gTQSrmy5RFxVUMXzLp/acQ = X-Received: by 2002:a05:6a00:acb:b0:72d:3b2e:fef9 with SMTP id d2e1a72fcca58-73e24af4b04mr1089043b3a.20.1745455776765; Wed, 23 Apr 2025 17:49:36 -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:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 002/148] exec/tswap: implement {ld, st}.*_p as functions instead of macros Date: Wed, 23 Apr 2025 17:47:07 -0700 Message-ID: <20250424004934.598783-3-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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 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 Signed-off-by: Richard Henderson Message-ID: <20250317183417.285700-3-pierrick.bouvier@linaro.org> --- 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 47b14446b8..d000fe4871 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -26,31 +26,6 @@ #include "exec/tswap.h" #include "hw/core/cpu.h" -/* 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 2683da0adb..84060a4999 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 */