Re: [PATCH v4 02/11] target/ppc: Inline cpu_ld/st_mmuidx_ra() calls in memory helpers

[Philippe Mathieu-Daudé]

On 22/1/26 22:00, Philippe Mathieu-Daudé wrote:

In preparation of removing the cpu_ld*_mmuidx_ra() and
cpu_st*_mmuidx_ra() calls, inline them.

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
  target/ppc/mem_helper.c | 37 ++++++++++++++++++++++++++++---------
  1 file changed, 28 insertions(+), 9 deletions(-)

@@ -241,8 +252,11 @@ void helper_stsw(CPUPPCState *env, target_ulong addr, 
uint32_t nb,
              break;
          }
      } else {
+        MemOp op = MO_TE | MO_UL | MO_UNALN;
+        MemOpIdx oi = make_memop_idx(op, mmu_idx);
+
          for (; nb > 3; nb -= 4) {
-            cpu_stl_mmuidx_ra(env, addr, env->gpr[reg], mmu_idx, raddr);
+            cpu_stl_mmu(env, addr, env->gpr[reg], oi, raddr);
              reg = (reg + 1) % 32;
              addr = addr_add(env, addr, 4);
          }
@@ -252,10 +266,12 @@ 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);
+            oi = make_memop_idx(MO_TE | MO_UW | MO_UNALN, 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);
+            oi = make_memop_idx(MO_TE | MO_UW | MO_UNALN, mmu_idx);
+            cpu_stw_mmu(env, addr, val >> 16, oi, raddr);
              addr = addr_add(env, addr, 2);
              cpu_stb_mmuidx_ra(env, addr, val >> 8, mmu_idx, raddr);
              break;

I failed my rebase :( v5 coming.