[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 14/25] translator: fix breakpoint processing
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v6 14/25] translator: fix breakpoint processing |
Date: |
Wed, 12 Sep 2018 11:19:10 +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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 0f9dca9..afd0a49 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -34,6 +34,8 @@ void translator_loop_temp_check(DisasContextBase *db)
void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
CPUState *cpu, TranslationBlock *tb)
{
+ int bp_insn = 0;
+
/* Initialize DisasContext */
db->tb = tb;
db->pc_first = tb->pc;
@@ -71,11 +73,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;
}
}
@@ -118,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] [PATCH v6 06/25] qcow2: introduce icount field for snapshots, (continued)
- [Qemu-devel] [PATCH v6 06/25] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 07/25] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 08/25] replay: provide and accessor for rr filename, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 09/25] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 10/25] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 11/25] replay: implement replay-seek command to proceed to the desired step, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 14/25] translator: fix breakpoint processing,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v6 12/25] replay: flush events when exiting, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 15/25] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 13/25] replay: refine replay-time module, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 16/25] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 17/25] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 18/25] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 19/25] replay: allow loading any snapshots before recording, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 20/25] replay: wake up vCPU when replaying, Pavel Dovgalyuk, 2018/09/12