[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v4 2/6] target/arm/translate: make DISAS_UPDATE match
From: |
Alex Bennée |
Subject: |
[Qemu-arm] [PATCH v4 2/6] target/arm/translate: make DISAS_UPDATE match declared semantics |
Date: |
Thu, 13 Jul 2017 15:19:24 +0100 |
DISAS_UPDATE should be used when the wider CPU state other than just
the PC has been updated and we should therefor exit the TCG runtime
and return to the main execution loop rather assuming DISAS_JUMP would
do that.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
target/arm/translate-a64.c | 14 +++++++-------
target/arm/translate.c | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index e55547d95d..66139b6046 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -11364,16 +11364,9 @@ void gen_intermediate_code_a64(ARMCPU *cpu,
TranslationBlock *tb)
case DISAS_NEXT:
gen_goto_tb(dc, 1, dc->pc);
break;
- default:
- case DISAS_UPDATE:
- gen_a64_set_pc_im(dc->pc);
- /* fall through */
case DISAS_JUMP:
tcg_gen_lookup_and_goto_ptr(cpu_pc);
break;
- case DISAS_EXIT:
- tcg_gen_exit_tb(0);
- break;
case DISAS_TB_JUMP:
case DISAS_EXC:
case DISAS_SWI:
@@ -11397,6 +11390,13 @@ void gen_intermediate_code_a64(ARMCPU *cpu,
TranslationBlock *tb)
*/
tcg_gen_exit_tb(0);
break;
+ case DISAS_UPDATE:
+ gen_a64_set_pc_im(dc->pc);
+ /* fall through */
+ case DISAS_EXIT:
+ default:
+ tcg_gen_exit_tb(0);
+ break;
}
}
diff --git a/target/arm/translate.c b/target/arm/translate.c
index 0862f9e4aa..5f2cea8641 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -12095,12 +12095,12 @@ void gen_intermediate_code(CPUARMState *env,
TranslationBlock *tb)
case DISAS_NEXT:
gen_goto_tb(dc, 1, dc->pc);
break;
- case DISAS_UPDATE:
- gen_set_pc_im(dc, dc->pc);
- /* fall through */
case DISAS_JUMP:
gen_goto_ptr();
break;
+ case DISAS_UPDATE:
+ gen_set_pc_im(dc, dc->pc);
+ /* fall through */
default:
/* indicate that the hash table must be used to find the next TB */
tcg_gen_exit_tb(0);
--
2.13.0
- [Qemu-arm] [PATCH v4 0/6] arm: fixes for eret, isb and DISAS_UPDATE handling, Alex Bennée, 2017/07/13
- [Qemu-arm] [PATCH v4 6/6] target/arm: use DISAS_EXIT for eret handling, Alex Bennée, 2017/07/13
- [Qemu-arm] [PATCH v4 2/6] target/arm/translate: make DISAS_UPDATE match declared semantics,
Alex Bennée <=
- [Qemu-arm] [PATCH v4 4/6] target/arm/translate: ensure gen_goto_tb sets exit flags, Alex Bennée, 2017/07/13
- [Qemu-arm] [PATCH v4 1/6] include/exec/exec-all: document common exit conditions, Alex Bennée, 2017/07/13
- [Qemu-arm] [PATCH v4 3/6] target/arm/translate.h: expand comment on DISAS_EXIT, Alex Bennée, 2017/07/13
- [Qemu-arm] [PATCH v4 5/6] target/arm: use gen_goto_tb for ISB handling, Alex Bennée, 2017/07/13
- Re: [Qemu-arm] [PATCH v4 0/6] arm: fixes for eret, isb and DISAS_UPDATE handling, Peter Maydell, 2017/07/14