[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 14/17] translator: fix breakpoint processing
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH 14/17] translator: fix breakpoint processing |
Date: |
Wed, 25 Apr 2018 15:46:55 +0300 |
User-agent: |
StGit/0.17.1-dirty |
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.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
accel/tcg/translator.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 23c6602..3c7a035 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -35,6 +35,7 @@ void translator_loop(const TranslatorOps *ops,
DisasContextBase *db,
CPUState *cpu, TranslationBlock *tb)
{
int max_insns;
+ int bp_insn = 0;
/* Initialize DisasContext */
db->tb = tb;
@@ -73,11 +74,13 @@ void translator_loop(const TranslatorOps *ops,
DisasContextBase *db,
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
/* 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;
QTAILQ_FOREACH(bp, &cpu->breakpoints, entry) {
if (bp->pc == db->pc_next) {
if (ops->breakpoint_check(db, cpu, bp)) {
+ bp_insn = 1;
break;
}
}
@@ -119,7 +122,7 @@ void translator_loop(const TranslatorOps *ops,
DisasContextBase *db,
/* Emit code to exit the TB, as indicated by db->is_jmp. */
ops->tb_stop(db, cpu);
- gen_tb_end(db->tb, db->num_insns);
+ gen_tb_end(db->tb, db->num_insns - bp_insn);
/* The disas_log hook may use these values rather than recompute. */
db->tb->size = db->pc_next - db->pc_first;
- [Qemu-devel] [RFC PATCH 08/17] replay: introduce info hmp/qmp command, (continued)
- [Qemu-devel] [RFC PATCH 08/17] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 09/17] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 10/17] replay: implement replay_seek command to proceed to the desired step, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 11/17] replay: flush events when exitting, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 12/17] timer: remove replay clock probe in deadline calculation, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 13/17] replay: refine replay-time module, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 15/17] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 14/17] translator: fix breakpoint processing,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH 17/17] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2018/04/25
- [Qemu-devel] [RFC PATCH 16/17] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2018/04/25
- Re: [Qemu-devel] [RFC PATCH 00/17] reverse debugging, Pavel Dovgalyuk, 2018/04/25
- Re: [Qemu-devel] [RFC PATCH 00/17] reverse debugging, Ciro Santilli, 2018/04/26
Message not available
Message not available