OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

accel/tcg: Handle -singlestep in curr_cflags

Browse Source 
Exchange the test in translator_use_goto_tb for CF_NO_GOTO_TB,
and the test in tb_gen_code for setting CF_COUNT_MASK to 1.

Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210717221851.2124573-6-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-07-17 15:18:43 -07:00
parent fb95701132
commit 04f5b647ed
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accel/tcg/cpu-exec.c
View File

@ -149,7 +149,13 @@ uint32_t curr_cflags(CPUState *cpu)
{ {
uint32_t cflags = cpu->tcg_cflags; uint32_t cflags = cpu->tcg_cflags;
if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { /*
* For singlestep and -d nochain, suppress goto_tb so that
* we can log -d cpu,exec after every TB.
*/
if (singlestep) {
cflags |= CF_NO_GOTO_TB | 1;
} else if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {
cflags |= CF_NO_GOTO_TB; cflags |= CF_NO_GOTO_TB;
} }

2
accel/tcg/translate-all.c
View File

@ -1432,7 +1432,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
} }
QEMU_BUILD_BUG_ON(CF_COUNT_MASK + 1 != TCG_MAX_INSNS); QEMU_BUILD_BUG_ON(CF_COUNT_MASK + 1 != TCG_MAX_INSNS);
if (cpu->singlestep_enabled || singlestep) { if (cpu->singlestep_enabled) {
max_insns = 1; max_insns = 1;
} }

2
accel/tcg/translator.c
View File

@ -39,7 +39,7 @@ bool translator_use_goto_tb(DisasContextBase *db, target_ulong dest)
} }
/* Suppress goto_tb in the case of single-steping. */ /* Suppress goto_tb in the case of single-steping. */
if (db->singlestep_enabled || singlestep) { if (db->singlestep_enabled) {
return false; return false;
} }