yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-22 11:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

translator: fix breakpoint processing

Browse source 
QEMU cannot pass through the breakpoints when 'si' command is used
in remote gdb. This patch disables inserting the breakpoints
when we are already single stepping though the gdb remote protocol.
This patch also fixes icount calculation for the blocks that include
breakpoints - instruction with breakpoint is not executed and shouldn't
be used in icount calculation.

Backports commit f9f1f56e4da088b993ce28775c271d5bcdcf49ae from qemu
This commit is contained in:
Pavel Dovgalyuk 2018-10-04 04:04:49 -04:00 committed by Lioncash
parent b9bb6cead9
commit 0242d19e79
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qemu/accel/tcg/translator.c
View file

@ -32,6 +32,7 @@ void translator_loop_temp_check(DisasContextBase *db)
void translator_loop(const TranslatorOps *ops, DisasContextBase *db, void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
CPUState *cpu, TranslationBlock *tb) CPUState *cpu, TranslationBlock *tb)
{ {
int bp_insn = 0;
TCGContext *tcg_ctx = cpu->uc->tcg_ctx; TCGContext *tcg_ctx = cpu->uc->tcg_ctx;
/* Initialize DisasContext */ /* Initialize DisasContext */
@ -98,11 +99,13 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */ tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
/* Pass breakpoint hits to target for further processing */ /* Pass breakpoint hits to target for further processing */
if (unlikely(!QTAILQ_EMPTY(&cpu->breakpoints))) { if (!db->singlestep_enabled
&& unlikely(!QTAILQ_EMPTY(&cpu->breakpoints))) {
CPUBreakpoint *bp; CPUBreakpoint *bp;
QTAILQ_FOREACH(bp, &cpu->breakpoints, entry) { QTAILQ_FOREACH(bp, &cpu->breakpoints, entry) {
if (bp->pc == db->pc_next) { if (bp->pc == db->pc_next) {
if (ops->breakpoint_check(db, cpu, bp)) { if (ops->breakpoint_check(db, cpu, bp)) {
bp_insn = 1;
break; break;
} }
} }
@ -147,7 +150,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
tb_end: tb_end:
/* Emit code to exit the TB, as indicated by db->is_jmp. */ /* Emit code to exit the TB, as indicated by db->is_jmp. */
ops->tb_stop(db, cpu); ops->tb_stop(db, cpu);
gen_tb_end(tcg_ctx, db->tb, db->num_insns); gen_tb_end(tcg_ctx, db->tb, db->num_insns - bp_insn);
/* The disas_log hook may use these values rather than recompute. */ /* The disas_log hook may use these values rather than recompute. */
db->tb->size = db->pc_next - db->pc_first; db->tb->size = db->pc_next - db->pc_first;