From patchwork Thu Apr 24 00:47:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883772 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3198018wrs; Wed, 23 Apr 2025 17:51:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3Vxr5QZ1rrZspfbkSMtmTMaWRK3E/WKYrW80Y1TWZ5LNMjglng3Xm8VeyOa5moP67ZibKHw==@linaro.org X-Google-Smtp-Source: AGHT+IGzI5LcTcqOOeAJiDA77QV/2ZpwDnwzUsWD6H6s90f03pxTUw+1RQN5Hq6iqltzaqMztJZS X-Received: by 2002:a05:620a:40cc:b0:7c5:658a:e584 with SMTP id af79cd13be357-7c956f5fff3mr141313085a.53.1745455891962; Wed, 23 Apr 2025 17:51:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745455891; cv=none; d=google.com; s=arc-20240605; b=IBJGx6yitvep72CT61qRMWHRMRd0VBkelR5kv0kGyTuwng6FWadjy/THKx73DT6QL+ t7nYlsWjYsSWb4Q2aGE72CjkeH7Lq9iXvYkTj1ygRyyvPVV1HaO+CyUA5FivYG+oVytp ULLj47JUqof7MKRNXa5EbKe0yGuDZ0DF146RuNISsOenEx82g7UvmKPMnkdoHV3FFV5h LYdJt/Pr5qDVOegIsxFYJO0V/OF5sv7kInrZGSUTsxXady9yWYfVyKR2EvJS9npFAQyk 4M+UeD2droOEZSzH7cZX0MUn/DlKGAgOoujBEoXzH6HDoZUDUFsuP6N5pLZbVe7dz6mT xWxg== 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=+VfuDyBOkc/7EHQm2vvPTUefKvEeqjpVe/tI2ANIcRc=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=GfSIbWucsJ00Zgtgl3wDEdEkRKP9RB+q0k7MUhWw5d2qMdWeGx+M7YCwPTOWgDnM13 nF4zJ81Iqpdznq6hE5f17XQoXjny+RgR1yQoqIa0R0N7WSLzRQ6LicA3E0E2NPfsc7wJ pqrISNBwCCbxcZggst2Gk1d8uDYdPcqnkw6btMNwDFwYuJT3quC9P9b0Iz5yME2UEuli 32ZPH1jxE2sWm0U3Dsw4zwBVr9eS+JOeEvRWoKuTRj+DR4sRfBzmljVuz6F2Sbj5HmWr 05iYDCji1LZSwfAACLE5g4VicF268yx/wBslNxaChy0vvlyecPHH/gUfucI2/qPM5Fml vHkw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="N/2zq7aV"; 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 d75a77b69052e-47e9fa99f48si5015871cf.194.2025.04.23.17.51.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 17:51:31 -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="N/2zq7aV"; 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 1u7knn-0006ET-RB; Wed, 23 Apr 2025 20:50:56 -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 1u7kmu-0005Or-Br for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:50:04 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kms-0004Ml-C1 for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:59 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso385227b3a.0 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=1745455797; x=1746060597; 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=+VfuDyBOkc/7EHQm2vvPTUefKvEeqjpVe/tI2ANIcRc=; b=N/2zq7aV8tIAFvxXd5X9WwtO+3Nyz4Omu1kDQ/GGcv36AN/TSuP9Zj7jnlSYA6C2d3 2NXI2LgmW0zqYBkqwCb81u4zGiUKLr+ic9YXzA0WHXAYs5IAMQJzyL/pQauTk27vaVUR bpxbDpnt/mhJ4zOOLzzGvLIwmWfHIvwqMUygwSL3siEWQ7vSM7dN7Nz+Pr7SoqXlXoH2 GrAHG0MLe44UKorWd1xxYC6nmraAcqNd2XdEmgGSqlUSHcqbKuXpbitv0GwSAEqr+ogS 7eH/E/1G7sbYU2l2zKZ9ACXc5XtHQjpIETElTm11gas7NyrLA4v3te0KGKlvHucLvGBB Krhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745455797; x=1746060597; 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=+VfuDyBOkc/7EHQm2vvPTUefKvEeqjpVe/tI2ANIcRc=; b=oFo5RqUqNhlx5bVFMIJTq/EJwLttqAXvYStIZetaSi3bgpvoTs5u/sC7EkFCLUigH1 4AMWln4YmphhjzjZwPEqzk+exkn/h7JE7Q9NSErZpSKnlJaeH5/9nY9Knsef2Iuy38AR l4SEj8VC6jPHdJghBvTdB6AaaiYEAFFHmI9HBEG2lbmETL6oMQrdrCc295dUNx6TzPIs MjEXpdVaDGZ9qq6v1kYdU9sVZJPUXwl0697nx85SK9Yabdql3etkLb7sa7zBEvQNJNJ9 zeRWur0+vLFpxzCV8ba1QDYLZFxJ9KYMmdjLd5voxDz9w4/7GJDtRTNUpB+Makc7XFTH HN8Q== X-Gm-Message-State: AOJu0YzWVwswM8BVJhlSeev9TKxPxdQXRDARU2yV4RvJHLI+mDvCQBMR 86PBEpc9tINOYNNZ33HGLX1apzFV6VxGQYlpyafO5zuQ+cpGQhCfZHR2pgxR2txn+OHQdDCzDT7 z X-Gm-Gg: ASbGncty/iHYrWS8RGq3qcTBcdoXlO+B74AcLpsd4anVnxCtU1QYyc4yNlQma+7F0n8 8Il5yh7OjVOyfozWVPZCV4HpWt4IvE6Yxv+flSMlJNNA4bYK5vTO89P8LCHMhHVpkuq0zy8U9DU gTWVfeq81aF4TcdtaeUpdWB/qbR/uRbISXf+3b4rs9S+kClcseWICtacqG4H9qOzf6r/zb5mWor GoUJgp4JZyNLEwPV3Ipd0ho/54fDouFe59cy3D2oZ+87mkwSdBg58jD2SPrzEE0/UMziqU1fsjU 1ywIKZFYeVjeYFxLg+mAmtjvrfNEHkIZ9/lQG4n07XdO8y0zsB+6QtaN24vW9qWPAcy8EJlJpTg = X-Received: by 2002:a05:6a20:394d:b0:1f5:8f65:a6f5 with SMTP id adf61e73a8af0-20444f22e85mr860203637.30.1745455796800; 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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:49:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 028/148] include/exec: Inline *_code memory operations Date: Wed, 23 Apr 2025 17:47:33 -0700 Message-ID: <20250424004934.598783-29-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::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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' and endianness. These expand inline to the *_mmu api with a lookup of the target's cpu_mmu_index() and ra == 0. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 31 +++++++++++++++++++++++++++---- accel/tcg/cputlb.c | 28 ---------------------------- accel/tcg/user-exec.c | 40 ---------------------------------------- 3 files changed, 27 insertions(+), 72 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 0054508eda..77dc5ac61c 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -473,10 +473,33 @@ cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val) # define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra #endif -uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr); -uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr); -uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr); -uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr); +static inline uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr) +{ + CPUState *cs = env_cpu(env); + MemOpIdx oi = make_memop_idx(MO_UB, cpu_mmu_index(cs, true)); + return cpu_ldb_code_mmu(env, addr, oi, 0); +} + +static inline uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr) +{ + CPUState *cs = env_cpu(env); + MemOpIdx oi = make_memop_idx(MO_TEUW, cpu_mmu_index(cs, true)); + return cpu_ldw_code_mmu(env, addr, oi, 0); +} + +static inline uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr) +{ + CPUState *cs = env_cpu(env); + MemOpIdx oi = make_memop_idx(MO_TEUL, cpu_mmu_index(cs, true)); + return cpu_ldl_code_mmu(env, addr, oi, 0); +} + +static inline uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr) +{ + CPUState *cs = env_cpu(env); + MemOpIdx oi = make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true)); + return cpu_ldq_code_mmu(env, addr, oi, 0); +} /** * tlb_vaddr_to_host: diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index b03998f926..2817c9dbdd 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2897,34 +2897,6 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, Int128 val, /* Code access functions. */ -uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs = env_cpu(env); - MemOpIdx oi = make_memop_idx(MO_UB, cpu_mmu_index(cs, true)); - return do_ld1_mmu(cs, addr, oi, 0, MMU_INST_FETCH); -} - -uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs = env_cpu(env); - MemOpIdx oi = make_memop_idx(MO_TEUW, cpu_mmu_index(cs, true)); - return do_ld2_mmu(cs, addr, oi, 0, MMU_INST_FETCH); -} - -uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs = env_cpu(env); - MemOpIdx oi = make_memop_idx(MO_TEUL, cpu_mmu_index(cs, true)); - return do_ld4_mmu(cs, addr, oi, 0, MMU_INST_FETCH); -} - -uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs = env_cpu(env); - MemOpIdx oi = make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true)); - return do_ld8_mmu(cs, addr, oi, 0, MMU_INST_FETCH); -} - uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t retaddr) { diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index dec17435c5..ebc7c3ecf5 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -1214,46 +1214,6 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, Int128 val, clear_helper_retaddr(); } -uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr ptr) -{ - uint32_t ret; - - set_helper_retaddr(1); - ret = ldub_p(g2h_untagged(ptr)); - clear_helper_retaddr(); - return ret; -} - -uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr ptr) -{ - uint32_t ret; - - set_helper_retaddr(1); - ret = lduw_p(g2h_untagged(ptr)); - clear_helper_retaddr(); - return ret; -} - -uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr ptr) -{ - uint32_t ret; - - set_helper_retaddr(1); - ret = ldl_p(g2h_untagged(ptr)); - clear_helper_retaddr(); - return ret; -} - -uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr) -{ - uint64_t ret; - - set_helper_retaddr(1); - ret = ldq_p(g2h_untagged(ptr)); - clear_helper_retaddr(); - return ret; -} - uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra) {