From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>
Subject: Re: [PATCH v2 08/28] target/i386: Use cpu_*_mmuidx_ra instead of templates
Date: Fri, 20 Dec 2019 17:42:58 +0000 [thread overview]
Message-ID: <87o8w2dhb1.fsf@linaro.org> (raw)
In-Reply-To: <20191216221158.29572-9-richard.henderson@linaro.org>
Richard Henderson <richard.henderson@linaro.org> writes:
> Do not use exec/cpu_ldst_{,useronly_}template.h directly,
> but instead use the functional interface.
>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/i386/seg_helper.c | 56 ++++++++++++++++++++--------------------
> 1 file changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c
> index 87a627f9dc..b96de068ca 100644
> --- a/target/i386/seg_helper.c
> +++ b/target/i386/seg_helper.c
> @@ -37,37 +37,37 @@
> # define LOG_PCALL_STATE(cpu) do { } while (0)
> #endif
>
> -#ifdef CONFIG_USER_ONLY
> -#define MEMSUFFIX _kernel
> -#define DATA_SIZE 1
> -#include "exec/cpu_ldst_useronly_template.h"
> +/*
> + * TODO: Convert callers to compute cpu_mmu_index_kernel once
> + * and use *_mmuidx_ra directly.
> + */
I guess this would only be if it was a significant performance impact?
They seem to be mainly called for (I assume) infrequently called
helpers.
Anyway lgtm:
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> +#define cpu_ldub_kernel_ra(e, p, r) \
> + cpu_ldub_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r)
> +#define cpu_lduw_kernel_ra(e, p, r) \
> + cpu_lduw_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r)
> +#define cpu_ldl_kernel_ra(e, p, r) \
> + cpu_ldl_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r)
> +#define cpu_ldq_kernel_ra(e, p, r) \
> + cpu_ldq_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r)
>
> -#define DATA_SIZE 2
> -#include "exec/cpu_ldst_useronly_template.h"
> +#define cpu_stb_kernel_ra(e, p, v, r) \
> + cpu_stb_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r)
> +#define cpu_stw_kernel_ra(e, p, v, r) \
> + cpu_stw_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r)
> +#define cpu_stl_kernel_ra(e, p, v, r) \
> + cpu_stl_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r)
> +#define cpu_stq_kernel_ra(e, p, v, r) \
> + cpu_stq_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r)
>
> -#define DATA_SIZE 4
> -#include "exec/cpu_ldst_useronly_template.h"
> +#define cpu_ldub_kernel(e, p) cpu_ldub_kernel_ra(e, p, 0)
> +#define cpu_lduw_kernel(e, p) cpu_lduw_kernel_ra(e, p, 0)
> +#define cpu_ldl_kernel(e, p) cpu_ldl_kernel_ra(e, p, 0)
> +#define cpu_ldq_kernel(e, p) cpu_ldq_kernel_ra(e, p, 0)
>
> -#define DATA_SIZE 8
> -#include "exec/cpu_ldst_useronly_template.h"
> -#undef MEMSUFFIX
> -#else
> -#define CPU_MMU_INDEX (cpu_mmu_index_kernel(env))
> -#define MEMSUFFIX _kernel
> -#define DATA_SIZE 1
> -#include "exec/cpu_ldst_template.h"
> -
> -#define DATA_SIZE 2
> -#include "exec/cpu_ldst_template.h"
> -
> -#define DATA_SIZE 4
> -#include "exec/cpu_ldst_template.h"
> -
> -#define DATA_SIZE 8
> -#include "exec/cpu_ldst_template.h"
> -#undef CPU_MMU_INDEX
> -#undef MEMSUFFIX
> -#endif
> +#define cpu_stb_kernel(e, p, v) cpu_stb_kernel_ra(e, p, v, 0)
> +#define cpu_stw_kernel(e, p, v) cpu_stw_kernel_ra(e, p, v, 0)
> +#define cpu_stl_kernel(e, p, v) cpu_stl_kernel_ra(e, p, v, 0)
> +#define cpu_stq_kernel(e, p, v) cpu_stq_kernel_ra(e, p, v, 0)
>
> /* return non zero if error */
> static inline int load_segment_ra(CPUX86State *env, uint32_t *e1_ptr,
--
Alex Bennée
next prev parent reply other threads:[~2019-12-20 17:43 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 22:11 [PATCH v2 00/28] cputlb: Remove support for MMU_MODE*_SUFFIX Richard Henderson
2019-12-16 22:11 ` [PATCH v2 01/28] target/xtensa: Use probe_access for itlb_hit_test Richard Henderson
2019-12-17 3:51 ` Philippe Mathieu-Daudé
2019-12-20 14:15 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 02/28] cputlb: Use trace_mem_get_info instead of trace_mem_build_info Richard Henderson
2019-12-17 3:59 ` Philippe Mathieu-Daudé
2019-12-20 15:04 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 03/28] trace: Remove trace_mem_build_info_no_se_[bl]e Richard Henderson
2019-12-20 16:38 ` Alex Bennée
2019-12-28 20:48 ` Richard Henderson
2019-12-16 22:11 ` [PATCH v2 04/28] cputlb: Move body of cpu_ldst_template.h out of line Richard Henderson
2019-12-20 17:07 ` Alex Bennée
2019-12-20 18:33 ` Alex Bennée
2019-12-20 18:36 ` Alex Bennée
2019-12-28 20:50 ` Richard Henderson
2019-12-16 22:11 ` [PATCH v2 05/28] translator: Use cpu_ld*_code instead of open-coding Richard Henderson
2019-12-20 17:12 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 06/28] cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code Richard Henderson
2019-12-20 17:25 ` Alex Bennée
2019-12-28 20:58 ` Richard Henderson
2019-12-16 22:11 ` [PATCH v2 07/28] cputlb: Provide cpu_(ld, st}*_mmuidx_ra for user-only Richard Henderson
2019-12-20 17:36 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 08/28] target/i386: Use cpu_*_mmuidx_ra instead of templates Richard Henderson
2019-12-20 17:42 ` Alex Bennée [this message]
2019-12-28 21:02 ` Richard Henderson
2019-12-16 22:11 ` [PATCH v2 09/28] target/s390x: Include tcg.h in mem_helper.c Richard Henderson
2019-12-20 17:43 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 10/28] target/arm: Include tcg.h in sve_helper.c Richard Henderson
2019-12-20 17:43 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 11/28] accel/tcg: Include tcg.h in tcg-runtime.c Richard Henderson
2019-12-16 22:11 ` [PATCH v2 12/28] linux-user: Include tcg.h in syscall.c Richard Henderson
2019-12-20 17:43 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 13/28] linux-user: Include trace-root.h in syscall-trace.h Richard Henderson
2019-12-20 17:49 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 14/28] cputlb: Expand cpu_ldst_useronly_template.h in user-exec.c Richard Henderson
2019-12-20 17:59 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 15/28] target/nios2: Remove MMU_MODE{0,1}_SUFFIX Richard Henderson
2019-12-20 18:02 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 16/28] target/alpha: " Richard Henderson
2019-12-20 18:02 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 17/28] target/cris: " Richard Henderson
2019-12-20 18:02 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 18/28] target/i386: Remove MMU_MODE{0,1,2}_SUFFIX Richard Henderson
2019-12-20 18:02 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 19/28] target/microblaze: " Richard Henderson
2019-12-20 18:03 ` [PATCH v2 19/28] target/microblaze: Remove MMU_MODE{0, 1, 2}_SUFFIX Alex Bennée
2019-12-16 22:11 ` [PATCH v2 20/28] target/sh4: Remove MMU_MODE{0,1}_SUFFIX Richard Henderson
2019-12-20 18:03 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 21/28] target/unicore32: " Richard Henderson
2019-12-20 18:03 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 22/28] target/xtensa: Remove MMU_MODE{0,1,2,3}_SUFFIX Richard Henderson
2019-12-20 19:30 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Richard Henderson
2019-12-20 19:34 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 24/28] target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX Richard Henderson
2019-12-20 19:37 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 25/28] target/s390x: " Richard Henderson
2019-12-20 19:39 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 26/28] target/ppc: " Richard Henderson
2019-12-20 19:51 ` Alex Bennée
2019-12-28 21:18 ` Richard Henderson
2019-12-29 8:40 ` David Gibson
2019-12-16 22:11 ` [PATCH v2 27/28] cputlb: Remove support for MMU_MODE*_SUFFIX Richard Henderson
2019-12-20 19:52 ` Alex Bennée
2019-12-16 22:11 ` [PATCH v2 28/28] cputlb: Expand cpu_ldst_template.h in cputlb.c Richard Henderson
2019-12-20 19:53 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o8w2dhb1.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).