From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XguFR-0004D0-CB for qemu-devel@nongnu.org; Wed, 22 Oct 2014 07:38:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XguFL-0004Ku-8Z for qemu-devel@nongnu.org; Wed, 22 Oct 2014 07:38:37 -0400 Received: from mail.ispras.ru ([83.149.199.45]:41625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XguFL-0004Ke-0w for qemu-devel@nongnu.org; Wed, 22 Oct 2014 07:38:31 -0400 From: Pavel Dovgalyuk Date: Wed, 22 Oct 2014 15:38:31 +0400 Message-ID: <20141022113831.9548.36452.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] i386: fix breakpoints handling in icount mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mark.burton@greensocs.com, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, zealot351@gmail.com, fred.konrad@greensocs.com This patch fixes instructions counting when execution is stopped on breakpoint (e.g. set from gdb). Without a patch extra instruction is translated and icount is incremented by invalid value (which equals to number of executed instructions + 1). Signed-off-by: Pavel Dovgalyuk --- target-i386/translate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 1284173..193cf9f 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -8000,7 +8000,7 @@ static inline void gen_intermediate_code_internal(X86CPU *cpu, if (bp->pc == pc_ptr && !((bp->flags & BP_CPU) && (tb->flags & HF_RF_MASK))) { gen_debug(dc, pc_ptr - dc->cs_base); - break; + goto done_generating; } } } @@ -8049,6 +8049,7 @@ static inline void gen_intermediate_code_internal(X86CPU *cpu, break; } } +done_generating: if (tb->cflags & CF_LAST_IO) gen_io_end(); gen_tb_end(tb, num_insns);