From e64e353590c2584b41cd1db925f67042a05f4250 Mon Sep 17 00:00:00 2001 From: Pavel Dovgalyuk Date: Wed, 22 Oct 2014 15:38:31 +0400 Subject: i386: fix breakpoints handling in icount mode 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 Signed-off-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk --- target-i386/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target-i386') diff --git a/target-i386/translate.c b/target-i386/translate.c index 418173e..782f7d2 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7987,7 +7987,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; } } } @@ -8038,6 +8038,7 @@ static inline void gen_intermediate_code_internal(X86CPU *cpu, } if (tb->cflags & CF_LAST_IO) gen_io_end(); +done_generating: gen_tb_end(tb, num_insns); *tcg_ctx.gen_opc_ptr = INDEX_op_end; /* we don't forget to fill the last values */ -- cgit v1.1