From patchwork Tue Apr 22 19:26:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883014 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2584815wrs; Tue, 22 Apr 2025 12:30:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMZIHe8akF7tjOoj+HabV1uyJZWSwKliaW4JWabxyY05D78yAtsFYSR1U9QNpigVSanQgFdg==@linaro.org X-Google-Smtp-Source: AGHT+IE0V9hlFHuclbHF30JUjfiOpSIBL67CLYeRN5DbAuDHyI2FnIXE6QKU1w6GMl9Ktm/VjBOJ X-Received: by 2002:a05:622a:13d1:b0:47a:e49c:dc05 with SMTP id d75a77b69052e-47aec365c62mr341496871cf.11.1745350213439; Tue, 22 Apr 2025 12:30:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745350213; cv=none; d=google.com; s=arc-20240605; b=N6ncciLUX5aozL9WBUYJ6nk9WbEEYOs+BR0JHF38bWEM19XmwnP5PNE3vrMS0W8rZs h028SZJEkj7tFnivjICveGvNqSUpHOgamvgO4J6iF68xewIwjOtR3F7Xo+WioJA4WJJt wpV5LZUFheWPjsp2lpbwAT3ktfbLGziTPZFlgVuWw0WE0x/xNCqTTnqTRXa4UJse0Kgp r23i7g6iTbIHoT6PNvmTJqhkP/4T0491nmqZWkacdxx+gcEiHyf663b/V5kWeAZ4n8la 2PXGeYvbWHs6gU+oqQdNq0of6wp0ErdYcxVxljjtRqzvKV7BuOvkoOLCxJ0mPGif/he+ P0cQ== 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=ckQgQMbKG4Xizq0EggcfytY90qXhlFfhvOxbZ5PqOFnfUdQPQhs84aQTCTVj6PMlt1 eaChyUqflyDX14uBnM32i8IIcr5cAI5mNWo+0TuKhj2rgteWAN+ACKip9BwZBdSxdMyW gMT774Pl54bqSj8swzprwuVaaCLRhzWLdUzOvXt1ZENIj09ChQjMR55eJAABiBsBE2uv Ifj+3O2O0Cl+PIaqF3IMkpE+Z+a2sXw8NgvLkL8apxab3ITlq+r4tf9zDd9pOdfSTqrL m3JlS+Z9Bc5T2T/868BOWseTTbAW9As5ls77ym6j2iqKa0Dos3GvChDG2xyeNNh0ZzWf VYaw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F39T21ZB; 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-47ae9cb72bdsi121679001cf.399.2025.04.22.12.30.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:30:13 -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=F39T21ZB; 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 1u7JJ1-0002tv-5e; Tue, 22 Apr 2025 15:29:20 -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 1u7JIV-0002W0-6a for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:28:48 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JIP-0006DA-7t for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:28:46 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2240b4de12bso83019075ad.2 for ; Tue, 22 Apr 2025 12:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350119; x=1745954919; 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=F39T21ZBjwq3sLIacHgZBQlA0Bap6WYoKwIHGv2BcHhgcDi3tyh9n3GKsBToCYBPr0 zehhf86jeW4I2DVRUR4WonB8WZfVsZUXqt6vH7iNevVAoCyWsDxMdSDinrwLLZlLC596 dcxjRGwee6AmCiqmpqLHSi8kZaYwiR96+RTbo/KuL3sPaTNZTD1OBEnS5N78h8GRMaxV wJO64ICkaCmMnhC5Z96UQJR/TN0NqhByMibWugcxbRJZvj9DXzmGqN3LlobyzpntVmRZ HH4Q66HXxyWyCljr5X/4cpE8NcghsDZP0GO/OO4fkWutbbxgGNbM/9jjxphrH1x+Fbim /9XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350119; x=1745954919; 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=GsBr74SR0ti0vFXBpuELYRuTziuvyL95gOE5nJRiiuFsIUtdA1beFn5GtzdJNHIfn0 6pXu20r+z/4+C+hRkRburszft0TBftdzrUrzBsRdptAb2OSrgF9wOxQJL0338j2WvjDg +T9FYYRhT0i6BET1wp4hpegvquysvT0bwlUtgjAULitE8ipQjxPi6am+jnHMIvV+AmNE qS1vGaB33vXKNP4mP9hp8Di4mw1FyKK4xsx98lqpyCXzhx2ABg8yTcQrjVUSNuc6rqGp pUY6btGigsb0XMxURDzdvAGqBVU3i4nx//Onn4PpSAvRj2zgoaSIlK+Gx9qtoZlni8fB BWmg== X-Gm-Message-State: AOJu0YxV8Z06nLWBH06Z3Wvee53ITaKwh6iDmaRVvf4SK/BMdFi6ncyD qz+kUWtMPznzxiMwk5llGhhQMxbMn6qhSSuQxafFzBUz869ssgLJPOtN9o7XY+RwOc7tjSJ6jLG C X-Gm-Gg: ASbGncvgOYzoXYz6xOo+pveQGZ/xu1McR2JkvKe66875BhlvAQlYchcDdbNKqpmupBD SU83DYOQHzu3dAaomDnHGxRfUN4HxOdxd+pDQvDv07W/wJ8trEZCFeSsfpHfvgzO/5BKS+iHUJh nP1+hHeIOWP0nIxa/vof039JIs6As6gW1D67ZTB/Ck6K/xTitgT0iy2AEqYOqedLOHEobLRXMKY P1mowzRXTHORNM2HwEPCLsmlsMFEpLSlt0Wf7pBRivyvFYnZhlK2RetXom/5XVhSz2U6sId+Ft9 3O7GZLEvjTONj1zzCtnHg394RFWfLfk2dG8MzT0+q3tui3PXV10Bm0VHTm0m9koSnb0iZR57iMf vFTEtp6J4KA== X-Received: by 2002:a17:902:db0f:b0:215:7421:262 with SMTP id d9443c01a7336-22c5357f020mr267068115ad.12.1745350118868; Tue, 22 Apr 2025 12:28:38 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3087df21278sm9146865a91.29.2025.04.22.12.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:28:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PATCH 028/147] include/exec: Inline *_code memory operations Date: Tue, 22 Apr 2025 12:26:17 -0700 Message-ID: <20250422192819.302784-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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) {