| Message ID | 20240513074717.130949-7-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/hppa: Misc improvements | expand |
* Richard Henderson <richard.henderson@linaro.org>: > The generic tcg driver will have already checked for breakpoints. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Helge Deller <deller@gmx.de> > --- > target/hppa/translate.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/target/hppa/translate.c b/target/hppa/translate.c > index 140dfb747a..d272be0e6e 100644 > --- a/target/hppa/translate.c > +++ b/target/hppa/translate.c > @@ -674,8 +674,9 @@ static bool use_goto_tb(DisasContext *ctx, uint64_t bofs, uint64_t nofs) > executing a TB that merely branches to the next TB. */ > static bool use_nullify_skip(DisasContext *ctx) > { > - return (((ctx->iaoq_b ^ ctx->iaoq_f) & TARGET_PAGE_MASK) == 0 > - && !cpu_breakpoint_test(ctx->cs, ctx->iaoq_b, BP_ANY)); > + return (!(tb_cflags(ctx->base.tb) & CF_BP_PAGE) > + && ctx->iaoq_b != -1 > + && is_same_page(&ctx->base, ctx->iaoq_b)); > } > > static void gen_goto_tb(DisasContext *ctx, int which, > -- > 2.34.1 >
diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 140dfb747a..d272be0e6e 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -674,8 +674,9 @@ static bool use_goto_tb(DisasContext *ctx, uint64_t bofs, uint64_t nofs) executing a TB that merely branches to the next TB. */ static bool use_nullify_skip(DisasContext *ctx) { - return (((ctx->iaoq_b ^ ctx->iaoq_f) & TARGET_PAGE_MASK) == 0 - && !cpu_breakpoint_test(ctx->cs, ctx->iaoq_b, BP_ANY)); + return (!(tb_cflags(ctx->base.tb) & CF_BP_PAGE) + && ctx->iaoq_b != -1 + && is_same_page(&ctx->base, ctx->iaoq_b)); } static void gen_goto_tb(DisasContext *ctx, int which,
The generic tcg driver will have already checked for breakpoints. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/hppa/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)