public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

accel/tcg: Track current value of can_do_io in the TB

Browse source 
Simplify translator_io_start by recording the current
known value of can_do_io within DisasContextBase.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
(cherry picked from commit 0ca41ccf1c555f97873b8e02a47390fd6af4b18f)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Richard Henderson 2023-09-14 08:06:14 -07:00 committed by Michael Tokarev
parent de11111ee8
commit a98097d3a9
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
accel/tcg/translator.c
View file

@ -16,11 +16,14 @@
#include "tcg/tcg-op-common.h" #include "tcg/tcg-op-common.h"
#include "internal.h" #include "internal.h"
static void gen_io_start(void) static void set_can_do_io(DisasContextBase *db, bool val)
{ {
tcg_gen_st_i32(tcg_constant_i32(1), cpu_env, if (db->saved_can_do_io != val) {
offsetof(ArchCPU, parent_obj.can_do_io) - db->saved_can_do_io = val;
offsetof(ArchCPU, env)); tcg_gen_st_i32(tcg_constant_i32(val), cpu_env,
offsetof(ArchCPU, parent_obj.can_do_io) -
offsetof(ArchCPU, env));
}
} }
bool translator_io_start(DisasContextBase *db) bool translator_io_start(DisasContextBase *db)
@ -30,12 +33,8 @@ bool translator_io_start(DisasContextBase *db)
if (!(cflags & CF_USE_ICOUNT)) { if (!(cflags & CF_USE_ICOUNT)) {
return false; return false;
} }
if (db->num_insns == db->max_insns && (cflags & CF_LAST_IO)) {
/* Already started in translator_loop. */
return true;
}
gen_io_start(); set_can_do_io(db, true);
/* /*
* Ensure that this instruction will be the last in the TB. * Ensure that this instruction will be the last in the TB.
@ -47,7 +46,7 @@ bool translator_io_start(DisasContextBase *db)
return true; return true;
} }
static TCGOp *gen_tb_start(uint32_t cflags) static TCGOp *gen_tb_start(DisasContextBase *db, uint32_t cflags)
{ {
TCGv_i32 count = NULL; TCGv_i32 count = NULL;
TCGOp *icount_start_insn = NULL; TCGOp *icount_start_insn = NULL;
@ -91,12 +90,9 @@ static TCGOp *gen_tb_start(uint32_t cflags)
* cpu->can_do_io is cleared automatically here at the beginning of * cpu->can_do_io is cleared automatically here at the beginning of
* each translation block. The cost is minimal and only paid for * each translation block. The cost is minimal and only paid for
* -icount, plus it would be very easy to forget doing it in the * -icount, plus it would be very easy to forget doing it in the
* translator. Doing it here means we don't need a gen_io_end() to * translator.
* go with gen_io_start().
*/ */
tcg_gen_st_i32(tcg_constant_i32(0), cpu_env, set_can_do_io(db, false);
offsetof(ArchCPU, parent_obj.can_do_io) -
offsetof(ArchCPU, env));
} }
return icount_start_insn; return icount_start_insn;
@ -147,6 +143,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
db->num_insns = 0; db->num_insns = 0;
db->max_insns = *max_insns; db->max_insns = *max_insns;
db->singlestep_enabled = cflags & CF_SINGLE_STEP; db->singlestep_enabled = cflags & CF_SINGLE_STEP;
db->saved_can_do_io = -1;
db->host_addr[0] = host_pc; db->host_addr[0] = host_pc;
db->host_addr[1] = NULL; db->host_addr[1] = NULL;
@ -154,7 +151,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */ tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
/* Start translating. */ /* Start translating. */
icount_start_insn = gen_tb_start(cflags); icount_start_insn = gen_tb_start(db, cflags);
ops->tb_start(db, cpu); ops->tb_start(db, cpu);
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */ tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
@ -181,7 +178,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
the next instruction. */ the next instruction. */
if (db->num_insns == db->max_insns && (cflags & CF_LAST_IO)) { if (db->num_insns == db->max_insns && (cflags & CF_LAST_IO)) {
/* Accept I/O on the last instruction. */ /* Accept I/O on the last instruction. */
gen_io_start(); set_can_do_io(db, true);
} }
ops->translate_insn(db, cpu); ops->translate_insn(db, cpu);

2
include/exec/translator.h
View file

@ -72,6 +72,7 @@ typedef enum DisasJumpType {
* @num_insns: Number of translated instructions (including current). * @num_insns: Number of translated instructions (including current).
* @max_insns: Maximum number of instructions to be translated in this TB. * @max_insns: Maximum number of instructions to be translated in this TB.
* @singlestep_enabled: "Hardware" single stepping enabled. * @singlestep_enabled: "Hardware" single stepping enabled.
* @saved_can_do_io: Known value of cpu->neg.can_do_io, or -1 for unknown.
* *
* Architecture-agnostic disassembly context. * Architecture-agnostic disassembly context.
*/ */
@ -83,6 +84,7 @@ typedef struct DisasContextBase {
int num_insns; int num_insns;
int max_insns; int max_insns;
bool singlestep_enabled; bool singlestep_enabled;
int8_t saved_can_do_io;
void *host_addr[2]; void *host_addr[2];
} DisasContextBase; } DisasContextBase;