From patchwork Thu Apr 24 00:47:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883866 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3206182wrs; Wed, 23 Apr 2025 18:17:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX/LOSFrS12M450X/OL6MiT3kZnxFvSScU/oIyEYOIQp5A/D/Pue4nNyWvECoupAY+rx+yV3g==@linaro.org X-Google-Smtp-Source: AGHT+IEe/5Bh/BrtYgvBANbHX+hv/vdWemmMdKygWzcopcesKIxpTeKWNT4TKu9eyDHBhHXsIeHC X-Received: by 2002:a05:6214:2349:b0:6ed:12b0:f182 with SMTP id 6a1803df08f44-6f4bfbe5ae3mr14036556d6.11.1745457450211; Wed, 23 Apr 2025 18:17:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745457450; cv=none; d=google.com; s=arc-20240605; b=LX00S/1duspWmdEe7O1fQNw3FmCCq7aqf84xKqYi+o/XyIkGNbtI3ZSt3tHNRLPhB4 fNXgdJUCmURaQ684aALJ2IMY0xlznU7CB7XxvoLDHh50pqFrK1q6VZA96vqDhPyckhTN LkyHfGeaPrKjyjMyx7eyxDlJfSlgTTlpZR9fpOj20oryP7p2xY4HFG/rGB66n/WR9OyO RQCdp3jVfHZ4AMbJeCukaD36I08h2RPyetT9J0bLY8UVMv8culYl0y3OaK1Qal+bA5N4 KZPZkQ918NqfnqmswwjBL/5jp2DnuyrIN7U8J/agJm2A9FL4Zs110HTRBiYrXSMyhyDW pnrg== 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=kj/uYgShChkHdccTvFGCpCr1FhgqEsUyeN3aymTPxRo=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=e4vIQ2eYd+LNgtwHXO4UREZSTxUrlDetlPsXiNvwY6Wr+M1LTr+7QZkN1dXfykYfYn cb/mksVdnpQzMPFb0wUu/VeiRMWk5q92fhSVjvsnbCxSjURuaNK+PvahfXL/0FheIZAm XUXuVhf8gtUwaK4CrgWqYYfdcskAFX7F5ouR5BgqxcCBoy2YevTEbhf626zavs5UakiI 4940sYfZowq5OUNJ8WGAu5BoniBbk7n5+0fdB4qhRojrZtDMk2QwaeHFv2WFf963cRJZ huju/6bDvUrxiLnqaLBmFRgSoqp86WqdbKUWAlatgSgv5Bl1W+XKRx0m4yGfp/0on5fJ E86Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="s23/HOvV"; 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 6a1803df08f44-6f4c0aceef2si3640996d6.190.2025.04.23.18.17.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 18:17: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="s23/HOvV"; 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 1u7kpa-0000Tz-9L; Wed, 23 Apr 2025 20:52:48 -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 1u7kmt-0005LV-Kv for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:59 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kmr-0004Ma-Fo for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:59 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-73972a54919so354074b3a.3 for ; Wed, 23 Apr 2025 17:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745455796; x=1746060596; 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=kj/uYgShChkHdccTvFGCpCr1FhgqEsUyeN3aymTPxRo=; b=s23/HOvVu1NX1cpSQ+4s+xkGYBYtkEp4mwTcN1NpiitBEqdz7WeL/R2fnSz2ZH/U1O XtBzNRrU/sxRyT1vKL1X9C3HCxa8yKJ2X6lD4NRQIYnj0pDbu1VKGUSdw6x4khh5i5ou /y1IsftWlIspPhIX9xMIPFfozALDP8VHE0GgjKk2mCKKZJ2nsRMDpw1cOq/0wkEazeLc WALCDj2sfCwX4+xfOZJ1reLb7KiSqemWgqabRL1eyvHAxr8xKyjuDj3U8hAXjWwCgWTL 1E7laWutlmQR7kFsKeY5XRnUN/T2u6MJFhNjBDQK0yzx8xjCLHtg1xI0EWdUc3HQfrME mTmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745455796; x=1746060596; 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=kj/uYgShChkHdccTvFGCpCr1FhgqEsUyeN3aymTPxRo=; b=TMmq8Cbc4oVNXYMTtrGpAl7joU+yMCaCGFKa380oVZ08p9ro3xuChWXZ9vx+1ZId+p x+t65lQxchHIK7ev5Hi/HfKFutRTwRNbiQ9OiL12pIkE0v+2uGqaVbPjU0JF2K3MGlEr vMTxQo5LSTetlpL8yfB3U/QMPAyrrggh7F6Uabetk1ukHGFTUi+f5BHBP2LE1pEV8f+l KMF5tKHoUXnFonkUWrxsPh9eySVzIXh4l1PrOnJP6z1rHESmD3NjNYV8Ve3cGwJVo8BN xQ+2gNRGiTnexwCn6LSTDOdcVJEwX8XeaxsxTxZiFEmaHlx606B1aYhBY81PjnKZlcpY YCQg== X-Gm-Message-State: AOJu0YynswxBLpoHcR1lxw7TNQd69eAyhgf/gUbktrBrkZWZxLkvFE/g ZzNPJaCHDSVrCN155t57aRIT0rFkud6jYTHXIlhA7zpd0LOiVc3RuCcGH6ge4cG2iVEAYEm29q3 7 X-Gm-Gg: ASbGncu0z0g+8E6X56ykfCloE8w1ALBGLCyUw03OlZBdBsEiKCUkJRQKFQ2ltfiEIEJ s8EutdAE38aGypvAa3UlhCHVUTIZL5E7+3lE3sJbkCfWnwdM3gDL6VWSrZITz0IngWPPbpxHFIf jGGIdIyqX8EMK6NxbwO2GBWuT5ePyqf4oW3p/NCyy15EQy+0P+uAAl60e1DryDmIBgq4Bn1Kxgi N6JRYFw2LQybgheOnnPMXgxAB+v+Kz0LOJNVMLnqbjprLiR6Qz4WYmabnokvr2p2JxQkN3Yqu+E MAJBDEaDaLRoznYIhXlGwIFROInfu8SdxDWbMtIPY5tmoAi1c7DOPWBZLlq4Bojl4s+OAKfQ7gg = X-Received: by 2002:a05:6a00:8f0c:b0:730:75b1:7219 with SMTP id d2e1a72fcca58-73e2465c0e9mr1108469b3a.12.1745455796093; Wed, 23 Apr 2025 17:49:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:49:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 027/148] include/exec: Inline *_data memory operations Date: Wed, 23 Apr 2025 17:47:32 -0700 Message-ID: <20250424004934.598783-28-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::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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 These need to be per-target for 'abi_ptr'. Expand inline to the *_data_ra api with ra == 0. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 123 ++++++++++++++++++++++++++++++------ accel/tcg/ldst_common.c.inc | 89 -------------------------- 2 files changed, 104 insertions(+), 108 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 2eda652a38..0054508eda 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -74,25 +74,6 @@ #include "user/guest-host.h" #endif /* CONFIG_USER_ONLY */ -uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr); -int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr); -uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr); -int cpu_ldsw_be_data(CPUArchState *env, abi_ptr ptr); -uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr); -uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr ptr); -uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr ptr); -int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr); -uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr); -uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr); - -void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val); -void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val); -void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val); -void cpu_stq_be_data(CPUArchState *env, abi_ptr ptr, uint64_t val); -void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val); -void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val); -void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val); - static inline uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra) { @@ -342,6 +323,110 @@ cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra) cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra); } +/*--------------------------*/ + +static inline uint32_t +cpu_ldub_data(CPUArchState *env, abi_ptr addr) +{ + return cpu_ldub_data_ra(env, addr, 0); +} + +static inline int +cpu_ldsb_data(CPUArchState *env, abi_ptr addr) +{ + return (int8_t)cpu_ldub_data(env, addr); +} + +static inline uint32_t +cpu_lduw_be_data(CPUArchState *env, abi_ptr addr) +{ + return cpu_lduw_be_data_ra(env, addr, 0); +} + +static inline int +cpu_ldsw_be_data(CPUArchState *env, abi_ptr addr) +{ + return (int16_t)cpu_lduw_be_data(env, addr); +} + +static inline uint32_t +cpu_ldl_be_data(CPUArchState *env, abi_ptr addr) +{ + return cpu_ldl_be_data_ra(env, addr, 0); +} + +static inline uint64_t +cpu_ldq_be_data(CPUArchState *env, abi_ptr addr) +{ + return cpu_ldq_be_data_ra(env, addr, 0); +} + +static inline uint32_t +cpu_lduw_le_data(CPUArchState *env, abi_ptr addr) +{ + return cpu_lduw_le_data_ra(env, addr, 0); +} + +static inline int +cpu_ldsw_le_data(CPUArchState *env, abi_ptr addr) +{ + return (int16_t)cpu_lduw_le_data(env, addr); +} + +static inline uint32_t +cpu_ldl_le_data(CPUArchState *env, abi_ptr addr) +{ + return cpu_ldl_le_data_ra(env, addr, 0); +} + +static inline uint64_t +cpu_ldq_le_data(CPUArchState *env, abi_ptr addr) +{ + return cpu_ldq_le_data_ra(env, addr, 0); +} + +static inline void +cpu_stb_data(CPUArchState *env, abi_ptr addr, uint32_t val) +{ + cpu_stb_data_ra(env, addr, val, 0); +} + +static inline void +cpu_stw_be_data(CPUArchState *env, abi_ptr addr, uint32_t val) +{ + cpu_stw_be_data_ra(env, addr, val, 0); +} + +static inline void +cpu_stl_be_data(CPUArchState *env, abi_ptr addr, uint32_t val) +{ + cpu_stl_be_data_ra(env, addr, val, 0); +} + +static inline void +cpu_stq_be_data(CPUArchState *env, abi_ptr addr, uint64_t val) +{ + cpu_stq_be_data_ra(env, addr, val, 0); +} + +static inline void +cpu_stw_le_data(CPUArchState *env, abi_ptr addr, uint32_t val) +{ + cpu_stw_le_data_ra(env, addr, val, 0); +} + +static inline void +cpu_stl_le_data(CPUArchState *env, abi_ptr addr, uint32_t val) +{ + cpu_stl_le_data_ra(env, addr, val, 0); +} + +static inline void +cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val) +{ + cpu_stq_le_data_ra(env, addr, val, 0); +} + #if TARGET_BIG_ENDIAN # define cpu_lduw_data cpu_lduw_be_data # define cpu_ldsw_data cpu_ldsw_be_data diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc index 2f203290db..9791a4e9ef 100644 --- a/accel/tcg/ldst_common.c.inc +++ b/accel/tcg/ldst_common.c.inc @@ -243,92 +243,3 @@ void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val, do_st16_mmu(env_cpu(env), addr, val, oi, retaddr); plugin_store_cb(env, addr, int128_getlo(val), int128_gethi(val), oi); } - -/* - * Wrappers of the above - */ - -uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr addr) -{ - return cpu_ldub_data_ra(env, addr, 0); -} - -int cpu_ldsb_data(CPUArchState *env, abi_ptr addr) -{ - return (int8_t)cpu_ldub_data(env, addr); -} - -uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr addr) -{ - return cpu_lduw_be_data_ra(env, addr, 0); -} - -int cpu_ldsw_be_data(CPUArchState *env, abi_ptr addr) -{ - return (int16_t)cpu_lduw_be_data(env, addr); -} - -uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr addr) -{ - return cpu_ldl_be_data_ra(env, addr, 0); -} - -uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr addr) -{ - return cpu_ldq_be_data_ra(env, addr, 0); -} - -uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr addr) -{ - return cpu_lduw_le_data_ra(env, addr, 0); -} - -int cpu_ldsw_le_data(CPUArchState *env, abi_ptr addr) -{ - return (int16_t)cpu_lduw_le_data(env, addr); -} - -uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr addr) -{ - return cpu_ldl_le_data_ra(env, addr, 0); -} - -uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr addr) -{ - return cpu_ldq_le_data_ra(env, addr, 0); -} - -void cpu_stb_data(CPUArchState *env, abi_ptr addr, uint32_t val) -{ - cpu_stb_data_ra(env, addr, val, 0); -} - -void cpu_stw_be_data(CPUArchState *env, abi_ptr addr, uint32_t val) -{ - cpu_stw_be_data_ra(env, addr, val, 0); -} - -void cpu_stl_be_data(CPUArchState *env, abi_ptr addr, uint32_t val) -{ - cpu_stl_be_data_ra(env, addr, val, 0); -} - -void cpu_stq_be_data(CPUArchState *env, abi_ptr addr, uint64_t val) -{ - cpu_stq_be_data_ra(env, addr, val, 0); -} - -void cpu_stw_le_data(CPUArchState *env, abi_ptr addr, uint32_t val) -{ - cpu_stw_le_data_ra(env, addr, val, 0); -} - -void cpu_stl_le_data(CPUArchState *env, abi_ptr addr, uint32_t val) -{ - cpu_stl_le_data_ra(env, addr, val, 0); -} - -void cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val) -{ - cpu_stq_le_data_ra(env, addr, val, 0); -}