Re: [PATCH 08/37] include/exec: Inline *_code memory operations

[Pierrick Bouvier <pierrick.bouvier@linaro.org>]

On 3/12/25 20:44, Richard Henderson wrote:
> These expand inline to the *_mmu api with a lookup of
> the target's cpu_mmu_index() and ra == 0.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   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 70e98ebc52..92b4cf20fd 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -472,10 +472,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 3f63b194bb..5bdbb6f968 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)
>   {

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>