[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/24] target/i386: Check CF_NO_GOTO_TB for dc->jmp_opt
From: |
Richard Henderson |
Subject: |
[PULL 08/24] target/i386: Check CF_NO_GOTO_TB for dc->jmp_opt |
Date: |
Sat, 16 Oct 2021 11:14:58 -0700 |
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 a46be75b00..c8d919bc3f 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
- [PULL 12/24] target/microblaze: Drop checks for singlestep_enabled, (continued)
- [PULL 12/24] target/microblaze: Drop checks for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 09/24] target/i386: Drop check for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 11/24] target/microblaze: Check CF_NO_GOTO_TB for DISAS_JUMP, Richard Henderson, 2021/10/16
- [PULL 18/24] target/riscv: Remove exit_tb and lookup_and_goto_ptr, Richard Henderson, 2021/10/16
- [PULL 17/24] target/riscv: Remove dead code after exception, Richard Henderson, 2021/10/16
- [PULL 02/24] target/alpha: Drop checks for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 06/24] target/arm: Drop checks for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 15/24] target/openrisc: Drop checks for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 20/24] target/s390x: Drop check for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 24/24] Revert "cpu: Move cpu_common_props to hw/core/cpu.c", Richard Henderson, 2021/10/16
- [PULL 08/24] target/i386: Check CF_NO_GOTO_TB for dc->jmp_opt,
Richard Henderson <=
- [PULL 22/24] target/tricore: Drop check for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 03/24] target/avr: Drop checks for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 13/24] target/mips: Fix single stepping, Richard Henderson, 2021/10/16
- [PULL 16/24] target/ppc: Drop exit checks for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 19/24] target/rx: Drop checks for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 23/24] target/xtensa: Drop check for singlestep_enabled, Richard Henderson, 2021/10/16
- [PULL 21/24] target/sh4: Drop check for singlestep_enabled, Richard Henderson, 2021/10/16
- Re: [PULL 00/24] tcg patch queue, Richard Henderson, 2021/10/16