[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/19] target/microblaze: Introduce DISAS_EXIT_NEXT, DISAS_EXIT_JU
From: |
Richard Henderson |
Subject: |
[PULL 06/19] target/microblaze: Introduce DISAS_EXIT_NEXT, DISAS_EXIT_JUMP |
Date: |
Mon, 7 Sep 2020 10:50:49 -0700 |
Like DISAS_EXIT, except we need to update cpu_pc,
either to pc_next or to btarget respectively.
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>
---
target/microblaze/translate.c | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index 8ceb04f4f0..2abef328a3 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -39,6 +39,11 @@
#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */
#define DISAS_EXIT DISAS_TARGET_1 /* all cpu state modified dynamically */
+/* cpu state besides pc was modified dynamically; update pc to next */
+#define DISAS_EXIT_NEXT DISAS_TARGET_2
+/* cpu state besides pc was modified dynamically; update pc to btarget */
+#define DISAS_EXIT_JUMP DISAS_TARGET_3
+
static TCGv_i32 cpu_R[32];
static TCGv_i32 cpu_pc;
static TCGv_i32 cpu_msr;
@@ -1712,8 +1717,7 @@ static void mb_tr_translate_insn(DisasContextBase *dcb,
CPUState *cs)
/* Force an exit if the per-tb cpu state has changed. */
if (dc->base.is_jmp == DISAS_NEXT && dc->cpustate_changed) {
- dc->base.is_jmp = DISAS_EXIT;
- tcg_gen_movi_i32(cpu_pc, dc->base.pc_next);
+ dc->base.is_jmp = DISAS_EXIT_NEXT;
}
}
@@ -1734,12 +1738,14 @@ static void mb_tr_tb_stop(DisasContextBase *dcb,
CPUState *cs)
return;
case DISAS_EXIT:
- if (unlikely(cs->singlestep_enabled)) {
- gen_raise_exception(dc, EXCP_DEBUG);
- } else {
- tcg_gen_exit_tb(NULL, 0);
- }
- return;
+ break;
+ case DISAS_EXIT_NEXT:
+ tcg_gen_movi_i32(cpu_pc, dc->base.pc_next);
+ break;
+ case DISAS_EXIT_JUMP:
+ tcg_gen_mov_i32(cpu_pc, cpu_btarget);
+ tcg_gen_discard_i32(cpu_btarget);
+ break;
case DISAS_JUMP:
if (dc->jmp_dest != -1 && !cs->singlestep_enabled) {
@@ -1781,6 +1787,13 @@ static void mb_tr_tb_stop(DisasContextBase *dcb,
CPUState *cs)
default:
g_assert_not_reached();
}
+
+ /* Finish DISAS_EXIT_* */
+ if (unlikely(cs->singlestep_enabled)) {
+ gen_raise_exception(dc, EXCP_DEBUG);
+ } else {
+ tcg_gen_exit_tb(NULL, 0);
+ }
}
static void mb_tr_disas_log(const DisasContextBase *dcb, CPUState *cs)
--
2.25.1
- [PULL 00/19] target/microblaze patch queue, Richard Henderson, 2020/09/07
- [PATCH] hw/hyperv: Fix 32-bit build error for vmbus., Richard Henderson, 2020/09/07
- [PULL 01/19] target/microblaze: Collected fixes for env->iflags, Richard Henderson, 2020/09/07
- [PULL 02/19] target/microblaze: Renumber D_FLAG, Richard Henderson, 2020/09/07
- [PULL 04/19] target/microblaze: Rename mmu structs, Richard Henderson, 2020/09/07
- [PULL 05/19] target/microblaze: Rename DISAS_UPDATE to DISAS_EXIT, Richard Henderson, 2020/09/07
- [PULL 03/19] target/microblaze: Cleanup mb_cpu_do_interrupt, Richard Henderson, 2020/09/07
- [PULL 06/19] target/microblaze: Introduce DISAS_EXIT_NEXT, DISAS_EXIT_JUMP,
Richard Henderson <=
- [PULL 07/19] target/microblaze: Replace cpustate_changed with DISAS_EXIT_NEXT, Richard Henderson, 2020/09/07
- [PULL 08/19] target/microblaze: Handle DISAS_EXIT_NEXT in delay slot, Richard Henderson, 2020/09/07
- [PULL 09/19] target/microblaze: Force rtid, rted, rtbd to exit, Richard Henderson, 2020/09/07
- [PULL 10/19] target/microblaze: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2020/09/07
- [PULL 11/19] target/microblaze: Diagnose invalid insns in delay slots, Richard Henderson, 2020/09/07
- [PULL 12/19] target/microblaze: Split out MicroBlazeCPUConfig, Richard Henderson, 2020/09/07
- [PULL 15/19] target/microblaze: Treat pvr_regs as constant, Richard Henderson, 2020/09/07
- [PULL 14/19] target/microblaze: Move pvr regs to MicroBlazeCPUConfig, Richard Henderson, 2020/09/07
- [PULL 16/19] target/microblaze: Move mmu parameters to MicroBlazeCPUConfig, Richard Henderson, 2020/09/07
- [PULL 17/19] target/microblaze: Fill in VMStateDescription for cpu, Richard Henderson, 2020/09/07