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

target/cris: Add DISAS_UPDATE_NEXT

Browse Source 
Move this pc update into tb_stop.
We will be able to re-use this code shortly.

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:50:12 -07:00
parent 9e9f5ba071
commit c96747521c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/cris/translate.c
View File

@ -52,9 +52,15 @@
#define BUG() (gen_BUG(dc, __FILE__, __LINE__)) #define BUG() (gen_BUG(dc, __FILE__, __LINE__))
#define BUG_ON(x) ({if (x) BUG();}) #define BUG_ON(x) ({if (x) BUG();})
/* is_jmp field values */ /*
#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */ * Target-specific is_jmp field values
#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */ */
/* Only pc was modified dynamically */
#define DISAS_JUMP DISAS_TARGET_0
/* Cpu state was modified dynamically, including pc */
#define DISAS_UPDATE DISAS_TARGET_1
/* Cpu state was modified dynamically, excluding pc -- use npc */
#define DISAS_UPDATE_NEXT DISAS_TARGET_2
/* Used by the decoder. */ /* Used by the decoder. */
#define EXTRACT_FIELD(src, start, end) \ #define EXTRACT_FIELD(src, start, end) \
@ -3268,8 +3274,8 @@ 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 && dc->cpustate_changed) { if (dc->base.is_jmp == DISAS_NEXT && dc->cpustate_changed) {
dc->base.is_jmp = DISAS_UPDATE; dc->base.is_jmp = DISAS_UPDATE_NEXT;
tcg_gen_movi_tl(env_pc, dc->pc); return;
} }
/* /*
@ -3311,6 +3317,7 @@ static void cris_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
if (unlikely(dc->base.singlestep_enabled)) { if (unlikely(dc->base.singlestep_enabled)) {
switch (is_jmp) { switch (is_jmp) {
case DISAS_TOO_MANY: case DISAS_TOO_MANY:
case DISAS_UPDATE_NEXT:
tcg_gen_movi_tl(env_pc, npc); tcg_gen_movi_tl(env_pc, npc);
/* fall through */ /* fall through */
case DISAS_JUMP: case DISAS_JUMP:
@ -3327,6 +3334,9 @@ static void cris_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
case DISAS_TOO_MANY: case DISAS_TOO_MANY:
gen_goto_tb(dc, 0, npc); gen_goto_tb(dc, 0, npc);
break; break;
case DISAS_UPDATE_NEXT:
tcg_gen_movi_tl(env_pc, npc);
/* fall through */
case DISAS_JUMP: case DISAS_JUMP:
case DISAS_UPDATE: case DISAS_UPDATE:
/* Indicate that interupts must be re-evaluated before the next TB. */ /* Indicate that interupts must be re-evaluated before the next TB. */