[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 08/23] target/i386: Check CF_NO_GOTO_TB for dc->jmp_opt
From: |
Richard Henderson |
Subject: |
[PATCH for-6.2 08/23] target/i386: Check CF_NO_GOTO_TB for dc->jmp_opt |
Date: |
Tue, 20 Jul 2021 20:41:40 -1000 |
We were using singlestep_enabled as a proxy for whether
translator_use_goto_tb would always return false.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/i386/tcg/translate.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index aacb605eee..4bd947cf86 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -8556,6 +8556,7 @@ static void i386_tr_init_disas_context(DisasContextBase
*dcbase, CPUState *cpu)
DisasContext *dc = container_of(dcbase, DisasContext, base);
CPUX86State *env = cpu->env_ptr;
uint32_t flags = dc->base.tb->flags;
+ uint32_t cflags = tb_cflags(dc->base.tb);
int cpl = (flags >> HF_CPL_SHIFT) & 3;
int iopl = (flags >> IOPL_SHIFT) & 3;
@@ -8593,14 +8594,14 @@ static void i386_tr_init_disas_context(DisasContextBase
*dcbase, CPUState *cpu)
dc->cpuid_ext3_features = env->features[FEAT_8000_0001_ECX];
dc->cpuid_7_0_ebx_features = env->features[FEAT_7_0_EBX];
dc->cpuid_xsave_features = env->features[FEAT_XSAVE];
- dc->jmp_opt = !(dc->base.singlestep_enabled ||
+ dc->jmp_opt = !((cflags & CF_NO_GOTO_TB) ||
(flags & (HF_TF_MASK | HF_INHIBIT_IRQ_MASK)));
/*
* If jmp_opt, we want to handle each string instruction individually.
* For icount also disable repz optimization so that each iteration
* is accounted separately.
*/
- dc->repz_opt = !dc->jmp_opt && !(tb_cflags(dc->base.tb) & CF_USE_ICOUNT);
+ dc->repz_opt = !dc->jmp_opt && !(cflags & CF_USE_ICOUNT);
dc->T0 = tcg_temp_new();
dc->T1 = tcg_temp_new();
--
2.25.1
- [PATCH for-6.2 00/23] tcg: gdb singlestep reorg, Richard Henderson, 2021/07/21
- [PATCH for-6.2 01/23] accel/tcg: Handle gdb singlestep in cpu_tb_exec, Richard Henderson, 2021/07/21
- [PATCH for-6.2 02/23] target/alpha: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 03/23] target/avr: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 04/23] target/cris: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 06/23] target/arm: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 07/23] target/hppa: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 08/23] target/i386: Check CF_NO_GOTO_TB for dc->jmp_opt,
Richard Henderson <=
- [PATCH for-6.2 13/23] target/mips: Fix single stepping, Richard Henderson, 2021/07/21
- [PATCH for-6.2 14/23] target/mips: Drop exit checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 15/23] target/openrisc: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 05/23] target/hexagon: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 09/23] target/i386: Drop check for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 10/23] target/m68k: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 11/23] target/microblaze: Check CF_NO_GOTO_TB for DISAS_JUMP, Richard Henderson, 2021/07/21
- [PATCH for-6.2 12/23] target/microblaze: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21