From nobody Sun Jan 25 12:00:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1769120009; cv=none; d=zohomail.com; s=zohoarc; b=Y1OBUcFw1rSBT9utQ7v/INV/B3TcHSlDHpxhaEBbCQj5m2QUCGNCwUamS8y2NjkqG6MX/zhNIHerOEUNlfEBHFmc6ARoXc9zLN87eO4LDcl0Ebr9uvgr3SVblw2/t9C0jwRhYMV0Ibit+JX+W0f8ntjRr/vlN1Vbgzf2psSCRrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769120009; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oemSyEpHaYDHaAfhztm3M5JIpYi10x+W8FZc95Yv/Ns=; b=FVJCG0s8HNjJOKe+H6iQq+Beg5S19RJqOvv8norgGIcDC2eZUZOvEbGzejpeMAAUq2cLoQd8/AU8T9K6PvdlypItxvDTX2nf7//2aj5jAXb7XMKYxHZteZw7IWPVYfTWgzjp9MtS/AN2Ike+aeErNxedBxibsH6qFiFlFrgAv3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769120009696863.6010310151916; Thu, 22 Jan 2026 14:13:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vj2tj-0006Ip-Ux; Thu, 22 Jan 2026 17:11:27 -0500 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 1vj2th-0006Fo-Ut for qemu-devel@nongnu.org; Thu, 22 Jan 2026 17:11:26 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vj2tg-0003KA-CQ for qemu-devel@nongnu.org; Thu, 22 Jan 2026 17:11:25 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-47ee937ecf2so13548565e9.0 for ; Thu, 22 Jan 2026 14:11:23 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4804dbaa3ecsm2864805e9.10.2026.01.22.14.11.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 22 Jan 2026 14:11:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769119882; x=1769724682; 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=oemSyEpHaYDHaAfhztm3M5JIpYi10x+W8FZc95Yv/Ns=; b=QxbwIhETk1RoOw+cx7ABUD48hFXXHnSR+dPjPMdrbzX3RbZkx65VB+2bOK7W96Hm1f leuLiNRPjK2gFQF+dc0Yc0RHeJmZLLN5LHRcLbqmFOZURvAszfJjT8wXMtavpU9m3sFz DV366IxTnOJKDLhFcdqqibCFwcqbjcorR6kSm87m7kAnqxGEHTieN2j7tFa1WrTTQQZg V5FFV3nnjoLflZxwxq+rMES4+HvZPG5kdUucojUUaP5zCAxLIrJBF06wfGSXzjUe9blQ 4y9BMP8p4TAB/nnWSbZeUvMQeuE1eKMJJo9XVc3YqVrT4TBX0sw7AYFDGbZj1XA7MAWC CgDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769119882; x=1769724682; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=oemSyEpHaYDHaAfhztm3M5JIpYi10x+W8FZc95Yv/Ns=; b=Hq3xX3C0N6Ofjwq9TU4x2c+UwZxLw91PaMdwTk4wflSUpaJOOsHYv7X2IWGIBqhCmX HPEt4TDDwlhH39BHQ4x4wt1ygB5J3sb8QYXe4Ab7jIYniAj2l0OewFXKmD4bpiebjfb2 SH7f3Noy+fhqrruGoldM0RQywA9oXt04ihg/z5xKdlgiNgGzlPY7xTGJjJ94r2+6EKbj 5dWCIrxx48suCtwxo7bSAo8UCvPvQkxkee3pFYTjAoxiukRvX4gOmT08qdg80U5TjxEJ zKHbU0bSOh97blFeuWHkZt7L0K8o4ApoELHwgS2CJS9cHeL4OQi/qVKtj/zva050G7Kf xaDw== X-Gm-Message-State: AOJu0YwvdpRcx2GvA8sM5KJ/jquzxjUCtMCi7ud72Iwk+Ig5wSDudvPb fQQ6WltEi8eHnjC4THW9Tq61IWKOIIgBL6j7kS181G1Q3f74pAhiSWu4y+d9rSf3adX/PTZpBP8 EuUGCiqo= X-Gm-Gg: AZuq6aIhZwdKT6FkTPifWZg38WwBahBrEbKtQE9lkL2GBTuGP7HpmFa0yAFI99U8XPo DtL/L2jLmBV3XkQoMUtkN+ckffIRd5SxdcfvbbRP6+PT5dsDmJQZm4mRKr1+mRj2VHyKAUkSKKV XdpgoS3N4bB/SZG29eRxuiXRiaePRjyo16mxSUecYacrpBmgnvC0quUtdDqVpOtNyY9SsI+/lFK +VTIbeCSjFjYOwt7f3Kc2+fLwZbHxCpA2820K0XhI6mkD8R+5DhWNv5or7L/2P15p3ImdzapezS aMy8E0800C/K76x0IG0FQDrONLoVLc+p8u6PMOcfq6yqbpkQQmMvviw3+ZVrsv9VfoX8kG+G7ff Ql6yBBnoPkeiLQYASDLZOi+6IHyJSDgRai6Ilfa3Bgqr/IEgSmXADypod4CQZ7yEAhhj6oad8vK ywg1oU5Fvnx5Ccu/KLF1Tsh86uE2lD2ATIDXtJZnpobYBE+u6O6KLoW+Ywm1OX X-Received: by 2002:a05:600c:8b58:b0:47e:e2b8:66e6 with SMTP id 5b1f17b1804b1-4804d2f69c6mr16353705e9.14.1769119882567; Thu, 22 Jan 2026 14:11:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Chinmay Rath , Nicholas Piggin , Anton Johansson , Richard Henderson , qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 02/11] target/ppc: Inline cpu_ld/st_mmuidx_ra() calls in memory helpers Date: Thu, 22 Jan 2026 23:10:56 +0100 Message-ID: <20260122221106.57184-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260122221106.57184-1-philmd@linaro.org> References: <20260122221106.57184-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1769120011752154100 In preparation of removing the cpu_ld*_mmuidx_ra() and cpu_st*_mmuidx_ra() calls, inline them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/mem_helper.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index 636ad769a93..90546967593 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -88,8 +88,11 @@ void helper_lmw(CPUPPCState *env, target_ulong addr, uin= t32_t reg) } } else { /* Slow path -- at least some of the operation requires i/o. */ + MemOp op =3D MO_TE | MO_UL | MO_UNALN; + MemOpIdx oi =3D make_memop_idx(op, mmu_idx); + for (; reg < 32; reg++) { - env->gpr[reg] =3D cpu_ldl_mmuidx_ra(env, addr, mmu_idx, raddr); + env->gpr[reg] =3D cpu_ldl_mmu(env, addr, oi, raddr); addr =3D addr_add(env, addr, 4); } } @@ -111,7 +114,10 @@ void helper_stmw(CPUPPCState *env, target_ulong addr, = uint32_t reg) } else { /* Slow path -- at least some of the operation requires i/o. */ for (; reg < 32; reg++) { - cpu_stl_mmuidx_ra(env, addr, env->gpr[reg], mmu_idx, raddr); + MemOp op =3D MO_TE | MO_UL | MO_UNALN; + MemOpIdx oi =3D make_memop_idx(op, mmu_idx); + + cpu_stl_mmu(env, addr, env->gpr[reg], oi, raddr); addr =3D addr_add(env, addr, 4); } } @@ -152,9 +158,12 @@ static void do_lsw(CPUPPCState *env, target_ulong addr= , uint32_t nb, break; } } else { + MemOp op =3D MO_TE | MO_UL | MO_UNALN; + MemOpIdx oi =3D make_memop_idx(op, mmu_idx); + /* Slow path -- at least some of the operation requires i/o. */ for (; nb > 3; nb -=3D 4) { - env->gpr[reg] =3D cpu_ldl_mmuidx_ra(env, addr, mmu_idx, raddr); + env->gpr[reg] =3D cpu_ldl_mmu(env, addr, oi, raddr); reg =3D (reg + 1) % 32; addr =3D addr_add(env, addr, 4); } @@ -165,10 +174,14 @@ static void do_lsw(CPUPPCState *env, target_ulong add= r, uint32_t nb, val =3D cpu_ldub_mmuidx_ra(env, addr, mmu_idx, raddr) << 24; break; case 2: - val =3D cpu_lduw_mmuidx_ra(env, addr, mmu_idx, raddr) << 16; + op =3D MO_TE | MO_UW | MO_UNALN; + oi =3D make_memop_idx(op, mmu_idx); + val =3D cpu_ldw_mmu(env, addr, oi, raddr) << 16; break; case 3: - val =3D cpu_lduw_mmuidx_ra(env, addr, mmu_idx, raddr) << 16; + op =3D MO_TE | MO_UW | MO_UNALN; + oi =3D make_memop_idx(op, mmu_idx); + val =3D cpu_ldw_mmu(env, addr, oi, raddr) << 16; addr =3D addr_add(env, addr, 2); val |=3D cpu_ldub_mmuidx_ra(env, addr, mmu_idx, raddr) << 8; break; @@ -241,8 +254,11 @@ void helper_stsw(CPUPPCState *env, target_ulong addr, = uint32_t nb, break; } } else { + MemOp op =3D MO_TE | MO_UL | MO_UNALN; + MemOpIdx oi =3D make_memop_idx(op, mmu_idx); + for (; nb > 3; nb -=3D 4) { - cpu_stl_mmuidx_ra(env, addr, env->gpr[reg], mmu_idx, raddr); + cpu_stl_mmu(env, addr, env->gpr[reg], oi, raddr); reg =3D (reg + 1) % 32; addr =3D addr_add(env, addr, 4); } @@ -252,10 +268,14 @@ void helper_stsw(CPUPPCState *env, target_ulong addr,= uint32_t nb, cpu_stb_mmuidx_ra(env, addr, val >> 24, mmu_idx, raddr); break; case 2: - cpu_stw_mmuidx_ra(env, addr, val >> 16, mmu_idx, raddr); + op =3D MO_TE | MO_UW | MO_UNALN; + oi =3D make_memop_idx(op, mmu_idx); + cpu_stw_mmu(env, addr, val >> 16, oi, raddr); break; case 3: - cpu_stw_mmuidx_ra(env, addr, val >> 16, mmu_idx, raddr); + op =3D MO_TE | MO_UW | MO_UNALN; + oi =3D make_memop_idx(op, mmu_idx); + cpu_stw_mmu(env, addr, val >> 16, oi, raddr); addr =3D addr_add(env, addr, 2); cpu_stb_mmuidx_ra(env, addr, val >> 8, mmu_idx, raddr); break; @@ -284,8 +304,11 @@ static void dcbz_common(CPUPPCState *env, target_ulong= addr, haddr =3D probe_write(env, addr, dcbz_size, mmu_idx, retaddr); if (unlikely(!haddr)) { /* Slow path */ + MemOp op =3D MO_TE | MO_UQ | MO_UNALN; + MemOpIdx oi =3D make_memop_idx(op, mmu_idx); + for (int i =3D 0; i < dcbz_size; i +=3D 8) { - cpu_stq_mmuidx_ra(env, addr + i, 0, mmu_idx, retaddr); + cpu_stq_mmu(env, addr + i, 0, oi, retaddr); } return; } --=20 2.52.0