xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 19:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target/rx: Store PSW.U in tb->flags

Browse Source 
With this, we don't need movcond to determine
which stack pointer is current.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Message-Id: <20220417165130.695085-3-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-17 09:51:28 -07:00
parent 4341631e4d
commit 3626a3fe37
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/rx/cpu.h
View File

@ -149,6 +149,7 @@ static inline void cpu_get_tb_cpu_state(CPURXState *env, target_ulong *pc,
*pc = env->pc; *pc = env->pc;
*cs_base = 0; *cs_base = 0;
*flags = FIELD_DP32(0, PSW, PM, env->psw_pm); *flags = FIELD_DP32(0, PSW, PM, env->psw_pm);
*flags = FIELD_DP32(*flags, PSW, U, env->psw_u);
} }
static inline int cpu_mmu_index(CPURXState *env, bool ifetch) static inline int cpu_mmu_index(CPURXState *env, bool ifetch)

42
target/rx/translate.c
View File

@ -311,9 +311,8 @@ static void psw_cond(DisasCompare *dc, uint32_t cond)
} }
} }
static void move_from_cr(TCGv ret, int cr, uint32_t pc) static void move_from_cr(DisasContext *ctx, TCGv ret, int cr, uint32_t pc)
{ {
TCGv z = tcg_const_i32(0);
switch (cr) { switch (cr) {
case 0: /* PSW */ case 0: /* PSW */
gen_helper_pack_psw(ret, cpu_env); gen_helper_pack_psw(ret, cpu_env);
@ -322,8 +321,11 @@ static void move_from_cr(TCGv ret, int cr, uint32_t pc)
tcg_gen_movi_i32(ret, pc); tcg_gen_movi_i32(ret, pc);
break; break;
case 2: /* USP */ case 2: /* USP */
tcg_gen_movcond_i32(TCG_COND_NE, ret, if (FIELD_EX32(ctx->tb_flags, PSW, U)) {
cpu_psw_u, z, cpu_sp, cpu_usp); tcg_gen_mov_i32(ret, cpu_sp);
} else {
tcg_gen_mov_i32(ret, cpu_usp);
}
break; break;
case 3: /* FPSW */ case 3: /* FPSW */
tcg_gen_mov_i32(ret, cpu_fpsw); tcg_gen_mov_i32(ret, cpu_fpsw);
@ -335,8 +337,11 @@ static void move_from_cr(TCGv ret, int cr, uint32_t pc)
tcg_gen_mov_i32(ret, cpu_bpc); tcg_gen_mov_i32(ret, cpu_bpc);
break; break;
case 10: /* ISP */ case 10: /* ISP */
tcg_gen_movcond_i32(TCG_COND_EQ, ret, if (FIELD_EX32(ctx->tb_flags, PSW, U)) {
cpu_psw_u, z, cpu_sp, cpu_isp); tcg_gen_mov_i32(ret, cpu_isp);
} else {
tcg_gen_mov_i32(ret, cpu_sp);
}
break; break;
case 11: /* FINTV */ case 11: /* FINTV */
tcg_gen_mov_i32(ret, cpu_fintv); tcg_gen_mov_i32(ret, cpu_fintv);
@ -350,28 +355,27 @@ static void move_from_cr(TCGv ret, int cr, uint32_t pc)
tcg_gen_movi_i32(ret, 0); tcg_gen_movi_i32(ret, 0);
break; break;
} }
tcg_temp_free(z);
} }
static void move_to_cr(DisasContext *ctx, TCGv val, int cr) static void move_to_cr(DisasContext *ctx, TCGv val, int cr)
{ {
TCGv z;
if (cr >= 8 && !is_privileged(ctx, 0)) { if (cr >= 8 && !is_privileged(ctx, 0)) {
/* Some control registers can only be written in privileged mode. */ /* Some control registers can only be written in privileged mode. */
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"disallow control register write %s", rx_crname(cr)); "disallow control register write %s", rx_crname(cr));
return; return;
} }
z = tcg_const_i32(0);
switch (cr) { switch (cr) {
case 0: /* PSW */ case 0: /* PSW */
gen_helper_set_psw(cpu_env, val); gen_helper_set_psw(cpu_env, val);
break; break;
/* case 1: to PC not supported */ /* case 1: to PC not supported */
case 2: /* USP */ case 2: /* USP */
tcg_gen_mov_i32(cpu_usp, val); if (FIELD_EX32(ctx->tb_flags, PSW, U)) {
tcg_gen_movcond_i32(TCG_COND_NE, cpu_sp, tcg_gen_mov_i32(cpu_sp, val);
cpu_psw_u, z, cpu_usp, cpu_sp); } else {
tcg_gen_mov_i32(cpu_usp, val);
}
break; break;
case 3: /* FPSW */ case 3: /* FPSW */
gen_helper_set_fpsw(cpu_env, val); gen_helper_set_fpsw(cpu_env, val);
@ -383,10 +387,11 @@ static void move_to_cr(DisasContext *ctx, TCGv val, int cr)
tcg_gen_mov_i32(cpu_bpc, val); tcg_gen_mov_i32(cpu_bpc, val);
break; break;
case 10: /* ISP */ case 10: /* ISP */
tcg_gen_mov_i32(cpu_isp, val); if (FIELD_EX32(ctx->tb_flags, PSW, U)) {
/* if PSW.U is 0, copy isp to r0 */ tcg_gen_mov_i32(cpu_isp, val);
tcg_gen_movcond_i32(TCG_COND_EQ, cpu_sp, } else {
cpu_psw_u, z, cpu_isp, cpu_sp); tcg_gen_mov_i32(cpu_sp, val);
}
break; break;
case 11: /* FINTV */ case 11: /* FINTV */
tcg_gen_mov_i32(cpu_fintv, val); tcg_gen_mov_i32(cpu_fintv, val);
@ -399,7 +404,6 @@ static void move_to_cr(DisasContext *ctx, TCGv val, int cr)
"Unimplement control register %d", cr); "Unimplement control register %d", cr);
break; break;
} }
tcg_temp_free(z);
} }
static void push(TCGv val) static void push(TCGv val)
@ -683,7 +687,7 @@ static bool trans_PUSHC(DisasContext *ctx, arg_PUSHC *a)
{ {
TCGv val; TCGv val;
val = tcg_temp_new(); val = tcg_temp_new();
move_from_cr(val, a->cr, ctx->pc); move_from_cr(ctx, val, a->cr, ctx->pc);
push(val); push(val);
tcg_temp_free(val); tcg_temp_free(val);
return true; return true;
@ -2221,7 +2225,7 @@ static bool trans_MVTC_r(DisasContext *ctx, arg_MVTC_r *a)
/* mvfc rs, rd */ /* mvfc rs, rd */
static bool trans_MVFC(DisasContext *ctx, arg_MVFC *a) static bool trans_MVFC(DisasContext *ctx, arg_MVFC *a)
{ {
move_from_cr(cpu_regs[a->rd], a->cr, ctx->pc); move_from_cr(ctx, cpu_regs[a->rd], a->cr, ctx->pc);
return true; return true;
} }