From 522a0d4e3c0d397ffb45ec400d8cbd426dad9d17 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 13 Oct 2015 22:07:49 +0000 Subject: [PATCH] target-*: Advance pc after recognizing a breakpoint Some targets already had this within their logic, but make sure it's present for all targets. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target-alpha/translate.c | 5 +++++ target-arm/translate-a64.c | 7 +++++-- target-arm/translate.c | 7 +++++-- target-cris/translate.c | 5 +++++ target-i386/translate.c | 5 +++++ target-lm32/translate.c | 5 +++++ target-m68k/translate.c | 5 +++++ target-microblaze/translate.c | 5 +++++ target-mips/translate.c | 6 ++++-- target-moxie/translate.c | 5 +++++ target-openrisc/translate.c | 5 +++++ target-ppc/translate.c | 5 +++++ target-s390x/translate.c | 5 +++++ target-sh4/translate.c | 5 +++++ target-sparc/translate.c | 2 +- target-unicore32/translate.c | 8 +++++--- target-xtensa/translate.c | 5 +++++ 17 files changed, 80 insertions(+), 10 deletions(-) diff --git a/target-alpha/translate.c b/target-alpha/translate.c index f936d1b5b94c..87950c63ecde 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -2917,6 +2917,11 @@ void gen_intermediate_code(CPUAlphaState *env, struct TranslationBlock *tb) if (unlikely(cpu_breakpoint_test(cs, ctx.pc, BP_ANY))) { gen_excp(&ctx, EXCP_DEBUG, 0); + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + ctx.pc += 4; break; } if (num_insns == max_insns && (tb->cflags & CF_LAST_IO)) { diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 19f9d8d2c8af..83b83762101d 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -11096,8 +11096,11 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb) dc->is_jmp = DISAS_UPDATE; } else { gen_exception_internal_insn(dc, 0, EXCP_DEBUG); - /* Advance PC so that clearing the breakpoint will - invalidate this TB. */ + /* The address covered by the breakpoint must be + included in [tb->pc, tb->pc + tb->size) in order + to for it to be properly cleared -- thus we + increment the PC here so that the logic setting + tb->size below does the right thing. */ dc->pc += 4; goto done_generating; } diff --git a/target-arm/translate.c b/target-arm/translate.c index 6be2c728f02c..b10a455e7023 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -11378,8 +11378,11 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb) dc->is_jmp = DISAS_UPDATE; } else { gen_exception_internal_insn(dc, 0, EXCP_DEBUG); - /* Advance PC so that clearing the breakpoint will - invalidate this TB. */ + /* The address covered by the breakpoint must be + included in [tb->pc, tb->pc + tb->size) in order + to for it to be properly cleared -- thus we + increment the PC here so that the logic setting + tb->size below does the right thing. */ /* TODO: Advance PC by correct instruction length to * avoid disassembler error messages */ dc->pc += 2; diff --git a/target-cris/translate.c b/target-cris/translate.c index 964845c46128..2d710cc108fb 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3166,6 +3166,11 @@ void gen_intermediate_code(CPUCRISState *env, struct TranslationBlock *tb) tcg_gen_movi_tl(env_pc, dc->pc); t_gen_raise_exception(EXCP_DEBUG); dc->is_jmp = DISAS_UPDATE; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc->pc += 2; break; } diff --git a/target-i386/translate.c b/target-i386/translate.c index 862f8e09fbd8..b400d2470a05 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7962,6 +7962,11 @@ void gen_intermediate_code(CPUX86State *env, TranslationBlock *tb) tb->flags & HF_RF_MASK ? BP_GDB : BP_ANY))) { gen_debug(dc, pc_ptr - dc->cs_base); + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + pc_ptr += 1; goto done_generating; } if (num_insns == max_insns && (tb->cflags & CF_LAST_IO)) { diff --git a/target-lm32/translate.c b/target-lm32/translate.c index c61ad0f9ab40..fa5b0b93a3f2 100644 --- a/target-lm32/translate.c +++ b/target-lm32/translate.c @@ -1078,6 +1078,11 @@ void gen_intermediate_code(CPULM32State *env, struct TranslationBlock *tb) tcg_gen_movi_tl(cpu_pc, dc->pc); t_gen_raise_exception(dc, EXCP_DEBUG); dc->is_jmp = DISAS_UPDATE; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc->pc += 4; break; } diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 5995ccea92f4..41ae2c605948 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -3004,6 +3004,11 @@ void gen_intermediate_code(CPUM68KState *env, TranslationBlock *tb) if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { gen_exception(dc, dc->pc, EXCP_DEBUG); dc->is_jmp = DISAS_JUMP; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc->pc += 2; break; } diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index a9c501099ce6..154b9d68361e 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -1693,6 +1693,11 @@ void gen_intermediate_code(CPUMBState *env, struct TranslationBlock *tb) if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { t_gen_raise_exception(dc, EXCP_DEBUG); dc->is_jmp = DISAS_UPDATE; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc->pc += 4; break; } diff --git a/target-mips/translate.c b/target-mips/translate.c index 897839ced968..a10bfa3a79b4 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -19594,8 +19594,10 @@ void gen_intermediate_code(CPUMIPSState *env, struct TranslationBlock *tb) save_cpu_state(&ctx, 1); ctx.bstate = BS_BRANCH; gen_helper_raise_exception_debug(cpu_env); - /* Include the breakpoint location or the tb won't - * be flushed when it must be. */ + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ ctx.pc += 4; goto done_generating; } diff --git a/target-moxie/translate.c b/target-moxie/translate.c index f84841efe204..6dedcb7a214d 100644 --- a/target-moxie/translate.c +++ b/target-moxie/translate.c @@ -848,6 +848,11 @@ void gen_intermediate_code(CPUMoxieState *env, struct TranslationBlock *tb) tcg_gen_movi_i32(cpu_pc, ctx.pc); gen_helper_debug(cpu_env); ctx.bstate = BS_EXCP; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + ctx.pc += 2; goto done_generating; } diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c index b66fde18fe37..606490a47b52 100644 --- a/target-openrisc/translate.c +++ b/target-openrisc/translate.c @@ -1665,6 +1665,11 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) tcg_gen_movi_tl(cpu_pc, dc->pc); gen_exception(dc, EXCP_DEBUG); dc->is_jmp = DISAS_UPDATE; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc->pc += 4; break; } diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 453509a425a5..308ad68880cd 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -11488,6 +11488,11 @@ void gen_intermediate_code(CPUPPCState *env, struct TranslationBlock *tb) if (unlikely(cpu_breakpoint_test(cs, ctx.nip, BP_ANY))) { gen_debug_exception(ctxp); + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + ctx.nip += 4; break; } diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 05d51fe84add..c79a2cb57a9e 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -5360,6 +5360,11 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb) if (unlikely(cpu_breakpoint_test(cs, dc.pc, BP_ANY))) { status = EXIT_PC_STALE; do_debug = true; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc.pc += 2; break; } diff --git a/target-sh4/translate.c b/target-sh4/translate.c index f764bc253933..7bc621649a56 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -1855,6 +1855,11 @@ void gen_intermediate_code(CPUSH4State * env, struct TranslationBlock *tb) tcg_gen_movi_i32(cpu_pc, ctx.pc); gen_helper_debug(cpu_env); ctx.bstate = BS_BRANCH; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + ctx.pc += 2; break; } diff --git a/target-sparc/translate.c b/target-sparc/translate.c index b59742ad2eb8..41a33193d8c5 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -5247,6 +5247,7 @@ void gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb) tcg_gen_insn_start(dc->pc, dc->npc); } num_insns++; + last_pc = dc->pc; if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { if (dc->pc != pc_start) { @@ -5262,7 +5263,6 @@ void gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb) gen_io_start(); } - last_pc = dc->pc; insn = cpu_ldl_code(env, dc->pc); disas_sparc_insn(dc, insn); diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index 48f89fb1c5c4..d2f92f02fc47 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -1917,9 +1917,11 @@ void gen_intermediate_code(CPUUniCore32State *env, TranslationBlock *tb) gen_set_pc_im(dc->pc); gen_exception(EXCP_DEBUG); dc->is_jmp = DISAS_JUMP; - /* Advance PC so that clearing the breakpoint will - invalidate this TB. */ - dc->pc += 2; /* FIXME */ + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc->pc += 4; goto done_generating; } diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index aa0c527dc42d..06b016341257 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -3088,6 +3088,11 @@ void gen_intermediate_code(CPUXtensaState *env, TranslationBlock *tb) tcg_gen_movi_i32(cpu_pc, dc.pc); gen_exception(&dc, EXCP_DEBUG); dc.is_jmp = DISAS_UPDATE; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc.pc += 2; break; }