From ff9359fca2fb22103c13143f91c1a36b6a16f019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 21 Nov 2025 10:02:20 +0100 Subject: [PATCH] target/sh4: Replace cpu_stl_data() call in OCBI helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation of removing the cpu_stl_data() call, inline it. Set the return address argument. See commit 852d481faf7 ("SH: Improve movca.l/ocbi emulation") for more context on this code. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20251126202200.23100-11-philmd@linaro.org> --- target/sh4/op_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c index 557b1bf497..669bc84cb6 100644 --- a/target/sh4/op_helper.c +++ b/target/sh4/op_helper.c @@ -136,6 +136,8 @@ void helper_discard_movcal_backup(CPUSH4State *env) void helper_ocbi(CPUSH4State *env, uint32_t address) { + unsigned mmu_idx = cpu_mmu_index(env_cpu(env), false); + MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_UNALN, mmu_idx); memory_content **current = &(env->movcal_backup); while (*current) { @@ -143,7 +145,8 @@ void helper_ocbi(CPUSH4State *env, uint32_t address) if ((a & ~0x1F) == (address & ~0x1F)) { memory_content *next = (*current)->next; - cpu_stl_data(env, a, (*current)->value); + + cpu_stl_mmu(env, a, (*current)->value, oi, GETPC()); if (next == NULL) {