From: Sergey Fedorov <serge.fdrv@gmail.com>
To: Richard Henderson <rth@twiddle.net>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: Re: [Qemu-devel] [PATCH] target-*: Advance pc after recognizing a breakpoint
Date: Wed, 14 Oct 2015 12:04:40 +0300 [thread overview]
Message-ID: <561E1AA8.2090604@gmail.com> (raw)
In-Reply-To: <1444774253-10492-1-git-send-email-rth@twiddle.net>
On 14.10.2015 01:10, Richard Henderson wrote:
> Some targets already had this within their logic, but make sure
> it's present for all targets.
>
> Signed-off-by: Richard Henderson <rth@twiddle.net>
Reported-by: Sergey Fedorov <serge.fdrv@gmail.com>
Thanks,
Sergey
> ---
> target-alpha/translate.c | 3 +++
> target-cris/translate.c | 3 +++
> target-i386/translate.c | 3 +++
> target-lm32/translate.c | 3 +++
> target-m68k/translate.c | 3 +++
> target-microblaze/translate.c | 3 +++
> target-moxie/translate.c | 3 +++
> target-openrisc/translate.c | 3 +++
> target-ppc/translate.c | 3 +++
> target-s390x/translate.c | 3 +++
> target-sh4/translate.c | 3 +++
> target-sparc/translate.c | 2 +-
> target-unicore32/translate.c | 2 +-
> target-xtensa/translate.c | 3 +++
> 14 files changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/target-alpha/translate.c b/target-alpha/translate.c
> index f936d1b..1a2d284 100644
> --- a/target-alpha/translate.c
> +++ b/target-alpha/translate.c
> @@ -2917,6 +2917,9 @@ 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);
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + ctx.pc += 4;
> break;
> }
> if (num_insns == max_insns && (tb->cflags & CF_LAST_IO)) {
> diff --git a/target-cris/translate.c b/target-cris/translate.c
> index 964845c..460cedd 100644
> --- a/target-cris/translate.c
> +++ b/target-cris/translate.c
> @@ -3166,6 +3166,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + dc->pc += 2;
> break;
> }
>
> diff --git a/target-i386/translate.c b/target-i386/translate.c
> index ef10e68..e4c3e7e 100644
> --- a/target-i386/translate.c
> +++ b/target-i386/translate.c
> @@ -7942,6 +7942,9 @@ 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);
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + 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 c61ad0f..0ade098 100644
> --- a/target-lm32/translate.c
> +++ b/target-lm32/translate.c
> @@ -1078,6 +1078,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + dc->pc += 4;
> break;
> }
>
> diff --git a/target-m68k/translate.c b/target-m68k/translate.c
> index 5995cce..93b5d2c 100644
> --- a/target-m68k/translate.c
> +++ b/target-m68k/translate.c
> @@ -3004,6 +3004,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + dc->pc += 2;
> break;
> }
>
> diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
> index a9c5010..ce76e9e 100644
> --- a/target-microblaze/translate.c
> +++ b/target-microblaze/translate.c
> @@ -1693,6 +1693,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + dc->pc += 4;
> break;
> }
>
> diff --git a/target-moxie/translate.c b/target-moxie/translate.c
> index f84841e..9fb9082 100644
> --- a/target-moxie/translate.c
> +++ b/target-moxie/translate.c
> @@ -848,6 +848,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + ctx.pc += 2;
> goto done_generating;
> }
>
> diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
> index b66fde1..0932249 100644
> --- a/target-openrisc/translate.c
> +++ b/target-openrisc/translate.c
> @@ -1665,6 +1665,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + dc->pc += 4;
> break;
> }
>
> diff --git a/target-ppc/translate.c b/target-ppc/translate.c
> index c2bc1a7..b15606d 100644
> --- a/target-ppc/translate.c
> +++ b/target-ppc/translate.c
> @@ -11488,6 +11488,9 @@ void gen_intermediate_code(CPUPPCState *env, struct TranslationBlock *tb)
>
> if (unlikely(cpu_breakpoint_test(cs, ctx.nip, BP_ANY))) {
> gen_debug_exception(ctxp);
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + ctx.nip += 4;
> break;
> }
>
> diff --git a/target-s390x/translate.c b/target-s390x/translate.c
> index 05d51fe..8dbc4fe 100644
> --- a/target-s390x/translate.c
> +++ b/target-s390x/translate.c
> @@ -5360,6 +5360,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + dc.pc += 2;
> break;
> }
>
> diff --git a/target-sh4/translate.c b/target-sh4/translate.c
> index f764bc2..5fc29bd 100644
> --- a/target-sh4/translate.c
> +++ b/target-sh4/translate.c
> @@ -1855,6 +1855,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + ctx.pc += 2;
> break;
> }
>
> diff --git a/target-sparc/translate.c b/target-sparc/translate.c
> index b59742a..41a3319 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 48f89fb..9d9f6e5 100644
> --- a/target-unicore32/translate.c
> +++ b/target-unicore32/translate.c
> @@ -1919,7 +1919,7 @@ void gen_intermediate_code(CPUUniCore32State *env, TranslationBlock *tb)
> dc->is_jmp = DISAS_JUMP;
> /* Advance PC so that clearing the breakpoint will
> invalidate this TB. */
> - dc->pc += 2; /* FIXME */
> + dc->pc += 4;
> goto done_generating;
> }
>
> diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
> index fda91b7..dfb3d8d 100644
> --- a/target-xtensa/translate.c
> +++ b/target-xtensa/translate.c
> @@ -3055,6 +3055,9 @@ 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;
> + /* Advance PC so that clearing the breakpoint will
> + invalidate this TB. */
> + dc.pc += 2;
> break;
> }
>
next prev parent reply other threads:[~2015-10-14 9:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-13 22:10 [Qemu-devel] [PATCH] target-*: Advance pc after recognizing a breakpoint Richard Henderson
2015-10-14 9:04 ` Sergey Fedorov [this message]
2015-10-14 19:34 ` Peter Maydell
2015-10-14 21:02 ` Richard Henderson
2015-10-15 16:36 ` Peter Maydell
2015-10-16 1:14 ` Richard Henderson
2015-10-16 7:33 ` Peter Maydell
2015-10-16 14:08 ` Sergey Fedorov
2015-10-16 16:36 ` Sergey Fedorov
2015-10-16 18:03 ` Sergey Fedorov
2015-10-18 22:46 ` Richard Henderson
2015-10-19 11:04 ` Sergey Fedorov
2015-10-19 17:04 ` Richard Henderson
2015-10-19 17:26 ` Sergey Fedorov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=561E1AA8.2090604@gmail.com \
--to=serge.fdrv@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.