[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 04/27] tcg/tci: Use exec/cpu_ldst.h interfaces
From: |
Alex Bennée |
Subject: |
Re: [PATCH 04/27] tcg/tci: Use exec/cpu_ldst.h interfaces |
Date: |
Fri, 05 Mar 2021 17:45:04 +0000 |
User-agent: |
mu4e 1.5.8; emacs 28.0.50 |
Richard Henderson <richard.henderson@linaro.org> writes:
> Use the provided cpu_ldst.h interfaces. This fixes the build vs
> the unconverted uses of g2h(), adds missed memory trace events,
> and correctly recognizes when a SIGSEGV belongs to the guest via
> set_helper_retaddr().
>
> Fixes: 3e8f1628e864
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tcg/tci.c | 73 +++++++++++++++++++++----------------------------------
> 1 file changed, 28 insertions(+), 45 deletions(-)
>
> diff --git a/tcg/tci.c b/tcg/tci.c
> index fb3c97aaf1..1c667537fe 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -346,51 +346,34 @@ static bool tci_compare64(uint64_t u0, uint64_t u1,
> TCGCond condition)
> return result;
> }
>
> -#ifdef CONFIG_SOFTMMU
> -# define qemu_ld_ub \
> - helper_ret_ldub_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
> -# define qemu_ld_leuw \
> - helper_le_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
> -# define qemu_ld_leul \
> - helper_le_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
> -# define qemu_ld_leq \
> - helper_le_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
> -# define qemu_ld_beuw \
> - helper_be_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
> -# define qemu_ld_beul \
> - helper_be_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
> -# define qemu_ld_beq \
> - helper_be_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
> -# define qemu_st_b(X) \
> - helper_ret_stb_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
> -# define qemu_st_lew(X) \
> - helper_le_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
> -# define qemu_st_lel(X) \
> - helper_le_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
> -# define qemu_st_leq(X) \
> - helper_le_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
> -# define qemu_st_bew(X) \
> - helper_be_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
> -# define qemu_st_bel(X) \
> - helper_be_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
> -# define qemu_st_beq(X) \
> - helper_be_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
> -#else
> -# define qemu_ld_ub ldub_p(g2h(taddr))
> -# define qemu_ld_leuw lduw_le_p(g2h(taddr))
> -# define qemu_ld_leul (uint32_t)ldl_le_p(g2h(taddr))
> -# define qemu_ld_leq ldq_le_p(g2h(taddr))
> -# define qemu_ld_beuw lduw_be_p(g2h(taddr))
> -# define qemu_ld_beul (uint32_t)ldl_be_p(g2h(taddr))
> -# define qemu_ld_beq ldq_be_p(g2h(taddr))
> -# define qemu_st_b(X) stb_p(g2h(taddr), X)
> -# define qemu_st_lew(X) stw_le_p(g2h(taddr), X)
> -# define qemu_st_lel(X) stl_le_p(g2h(taddr), X)
> -# define qemu_st_leq(X) stq_le_p(g2h(taddr), X)
> -# define qemu_st_bew(X) stw_be_p(g2h(taddr), X)
> -# define qemu_st_bel(X) stl_be_p(g2h(taddr), X)
> -# define qemu_st_beq(X) stq_be_p(g2h(taddr), X)
> -#endif
> +#define qemu_ld_ub \
> + cpu_ldub_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_ld_leuw \
> + cpu_lduw_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_ld_leul \
> + cpu_ldl_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_ld_leq \
> + cpu_ldq_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_ld_beuw \
> + cpu_lduw_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_ld_beul \
> + cpu_ldl_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_ld_beq \
> + cpu_ldq_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_st_b(X) \
> + cpu_stb_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_st_lew(X) \
> + cpu_stw_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_st_lel(X) \
> + cpu_stl_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_st_leq(X) \
> + cpu_stq_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_st_bew(X) \
> + cpu_stw_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_st_bel(X) \
> + cpu_stl_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
> +#define qemu_st_beq(X) \
> + cpu_stq_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
>
> #if TCG_TARGET_REG_BITS == 64
> # define CASE_32_64(x) \
--
Alex Bennée
- [PATCH 01/27] tcg/aarch64: Fix constant subtraction in tcg_out_addsub2, (continued)
- [PATCH 01/27] tcg/aarch64: Fix constant subtraction in tcg_out_addsub2, Richard Henderson, 2021/03/02
- [PATCH 02/27] tcg/aarch64: Fix I3617_CMLE0, Richard Henderson, 2021/03/02
- [PATCH 05/27] tcg: Split out tcg_raise_tb_overflow, Richard Henderson, 2021/03/02
- [PATCH 03/27] tcg/aarch64: Fix generation of "scalar" vector operations, Richard Henderson, 2021/03/02
- [PATCH 04/27] tcg/tci: Use exec/cpu_ldst.h interfaces, Richard Henderson, 2021/03/02
- [PATCH 06/27] tcg: Manage splitwx in tc_ptr_to_region_tree by hand, Richard Henderson, 2021/03/02
- [PATCH 07/27] tcg/tci: Merge identical cases in generation (arithmetic opcodes), Richard Henderson, 2021/03/02
- [PATCH 09/27] tcg/tci: Merge identical cases in generation (deposit opcode), Richard Henderson, 2021/03/02
- [PATCH 08/27] tcg/tci: Merge identical cases in generation (exchange opcodes), Richard Henderson, 2021/03/02
- [PATCH 10/27] tcg/tci: Merge identical cases in generation (conditional opcodes), Richard Henderson, 2021/03/02
- [PATCH 11/27] tcg/tci: Merge identical cases in generation (load/store opcodes), Richard Henderson, 2021/03/02
- [PATCH 12/27] tcg/tci: Remove tci_read_r8, Richard Henderson, 2021/03/02
- [PATCH 13/27] tcg/tci: Remove tci_read_r8s, Richard Henderson, 2021/03/02