From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>
Subject: Re: [PATCH v2 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX
Date: Fri, 20 Dec 2019 19:34:16 +0000 [thread overview]
Message-ID: <87eewybxl3.fsf@linaro.org> (raw)
In-Reply-To: <20191216221158.29572-24-richard.henderson@linaro.org>
Richard Henderson <richard.henderson@linaro.org> writes:
> The generated *_user functions are unused. The *_kernel functions
> have a couple of users in op_helper.c; use *_mmuidx_ra instead,
> with MMU_KERNEL_IDX.
>
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> v2: Use *_mmuidx_ra directly, without intermediate macros.
> ---
> target/m68k/cpu.h | 2 --
> target/m68k/op_helper.c | 77 +++++++++++++++++++++++++----------------
> 2 files changed, 47 insertions(+), 32 deletions(-)
>
> diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
> index 20de3c379a..89af14e899 100644
> --- a/target/m68k/cpu.h
> +++ b/target/m68k/cpu.h
> @@ -516,8 +516,6 @@ enum {
> #define cpu_list m68k_cpu_list
>
> /* MMU modes definitions */
> -#define MMU_MODE0_SUFFIX _kernel
> -#define MMU_MODE1_SUFFIX _user
> #define MMU_KERNEL_IDX 0
> #define MMU_USER_IDX 1
> static inline int cpu_mmu_index (CPUM68KState *env, bool ifetch)
> diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
> index bc4f845e3f..202498deb5 100644
> --- a/target/m68k/op_helper.c
> +++ b/target/m68k/op_helper.c
> @@ -42,8 +42,8 @@ static void cf_rte(CPUM68KState *env)
> uint32_t fmt;
>
> sp = env->aregs[7];
> - fmt = cpu_ldl_kernel(env, sp);
> - env->pc = cpu_ldl_kernel(env, sp + 4);
> + fmt = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
> + env->pc = cpu_ldl_mmuidx_ra(env, sp + 4, MMU_KERNEL_IDX, 0);
> sp |= (fmt >> 28) & 3;
> env->aregs[7] = sp + 8;
>
> @@ -58,13 +58,13 @@ static void m68k_rte(CPUM68KState *env)
>
> sp = env->aregs[7];
> throwaway:
> - sr = cpu_lduw_kernel(env, sp);
> + sr = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
> sp += 2;
> - env->pc = cpu_ldl_kernel(env, sp);
> + env->pc = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
> sp += 4;
> if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
> /* all except 68000 */
> - fmt = cpu_lduw_kernel(env, sp);
> + fmt = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
> sp += 2;
> switch (fmt >> 12) {
> case 0:
> @@ -260,12 +260,12 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw)
> /* ??? This could cause MMU faults. */
> sp &= ~3;
> sp -= 4;
> - cpu_stl_kernel(env, sp, retaddr);
> + cpu_stl_mmuidx_ra(env, sp, retaddr, MMU_KERNEL_IDX, 0);
> sp -= 4;
> - cpu_stl_kernel(env, sp, fmt);
> + cpu_stl_mmuidx_ra(env, sp, fmt, MMU_KERNEL_IDX, 0);
> env->aregs[7] = sp;
> /* Jump to vector. */
> - env->pc = cpu_ldl_kernel(env, env->vbr + vector);
> + env->pc = cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0);
> }
>
> static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
> @@ -278,23 +278,24 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
> switch (format) {
> case 4:
> *sp -= 4;
> - cpu_stl_kernel(env, *sp, env->pc);
> + cpu_stl_mmuidx_ra(env, *sp, env->pc, MMU_KERNEL_IDX, 0);
> *sp -= 4;
> - cpu_stl_kernel(env, *sp, addr);
> + cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0);
> break;
> case 3:
> case 2:
> *sp -= 4;
> - cpu_stl_kernel(env, *sp, addr);
> + cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0);
> break;
> }
> *sp -= 2;
> - cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << 2));
> + cpu_stw_mmuidx_ra(env, *sp, (format << 12) + (cs->exception_index << 2),
> + MMU_KERNEL_IDX, 0);
> }
> *sp -= 4;
> - cpu_stl_kernel(env, *sp, retaddr);
> + cpu_stl_mmuidx_ra(env, *sp, retaddr, MMU_KERNEL_IDX, 0);
> *sp -= 2;
> - cpu_stw_kernel(env, *sp, sr);
> + cpu_stw_mmuidx_ra(env, *sp, sr, MMU_KERNEL_IDX, 0);
> }
>
> static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
> @@ -353,36 +354,52 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
> cpu_abort(cs, "DOUBLE MMU FAULT\n");
> }
> env->mmu.fault = true;
> + /* push data 3 */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* push data 3 */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* push data 2 */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* push data 2 */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* push data 1 */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* push data 1 */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 1 / push data 0 */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* write back 1 / push data 0 */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 1 address */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* write back 1 address */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 2 data */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* write back 2 data */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 2 address */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* write back 2 address */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 3 data */
> sp -= 4;
> - cpu_stl_kernel(env, sp, 0); /* write back 3 data */
> + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 3 address */
> sp -= 4;
> - cpu_stl_kernel(env, sp, env->mmu.ar); /* write back 3 address */
> + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0);
> + /* fault address */
> sp -= 4;
> - cpu_stl_kernel(env, sp, env->mmu.ar); /* fault address */
> + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0);
> + /* write back 1 status */
> sp -= 2;
> - cpu_stw_kernel(env, sp, 0); /* write back 1 status */
> + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 2 status */
> sp -= 2;
> - cpu_stw_kernel(env, sp, 0); /* write back 2 status */
> + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* write back 3 status */
> sp -= 2;
> - cpu_stw_kernel(env, sp, 0); /* write back 3 status */
> + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
> + /* special status word */
> sp -= 2;
> - cpu_stw_kernel(env, sp, env->mmu.ssw); /* special status word */
> + cpu_stw_mmuidx_ra(env, sp, env->mmu.ssw, MMU_KERNEL_IDX, 0);
> + /* effective address */
> sp -= 4;
> - cpu_stl_kernel(env, sp, env->mmu.ar); /* effective address */
> + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0);
> +
> do_stack_frame(env, &sp, 7, oldsr, 0, retaddr);
> env->mmu.fault = false;
> if (qemu_loglevel_mask(CPU_LOG_INT)) {
> @@ -414,7 +431,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
>
> env->aregs[7] = sp;
> /* Jump to vector. */
> - env->pc = cpu_ldl_kernel(env, env->vbr + vector);
> + env->pc = cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0);
> }
>
> static void do_interrupt_all(CPUM68KState *env, int is_hw)
--
Alex Bennée
next prev parent reply other threads:[~2019-12-20 19:35 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
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 [this message]
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=87eewybxl3.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--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).