mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/cris: Fold unhandled X_FLAG changes into cpustate_changed

Browse Source 
We really do this already, by including them into the same test.
This just hoists the expression up a bit.

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-06-22 07:20:30 -07:00
parent 5899ce683e
commit afd5a3310c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/cris/translate.c
View File

@ -3217,6 +3217,10 @@ static void cris_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
cris_clear_x_flag(dc); cris_clear_x_flag(dc);
} }
/* Fold unhandled changes to X_FLAG into cpustate_changed. */
dc->cpustate_changed |= !dc->flagx_known;
dc->cpustate_changed |= dc->flags_x != (dc->base.tb->flags & X_FLAG);
/* /*
* Check for delayed branches here. If we do it before * Check for delayed branches here. If we do it before
* actually generating any host code, the simulator will just * actually generating any host code, the simulator will just
@ -3227,9 +3231,7 @@ static void cris_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
t_gen_movi_env_TN(dslot, 0); t_gen_movi_env_TN(dslot, 0);
} }
if (dc->cpustate_changed if (dc->cpustate_changed) {
|| !dc->flagx_known
|| (dc->flags_x != (dc->base.tb->flags & X_FLAG))) {
cris_store_direct_jmp(dc); cris_store_direct_jmp(dc);
} }
@ -3263,10 +3265,7 @@ static void cris_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
} }
/* Force an update if the per-tb cpu state has changed. */ /* Force an update if the per-tb cpu state has changed. */
if (dc->base.is_jmp == DISAS_NEXT if (dc->base.is_jmp == DISAS_NEXT && dc->cpustate_changed) {
&& (dc->cpustate_changed
|| !dc->flagx_known
|| (dc->flags_x != (dc->base.tb->flags & X_FLAG)))) {
dc->base.is_jmp = DISAS_UPDATE; dc->base.is_jmp = DISAS_UPDATE;
tcg_gen_movi_tl(env_pc, dc->pc); tcg_gen_movi_tl(env_pc, dc->pc);
} }