target/s390x: Disable conditional branch-to-next for PER

For PER, we require a conditional call to helper_per_branch
for the conditional branch.  Fold the remaining optimization
into a call to helper_goto_direct, which will take care of
the remaining gbea adjustment.

Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240502054417.234340-6-richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Richard Henderson 2024-05-01 22:44:08 -07:00 committed by Thomas Huth
parent 62613ca073
commit a90e319569
1 changed files with 7 additions and 7 deletions

View File

@ -1131,13 +1131,13 @@ static DisasJumpType help_branch(DisasContext *s, DisasCompare *c,
goto egress; goto egress;
} }
if (is_imm) { if (is_imm) {
if (dest == s->pc_tmp) { /*
/* Branch to next. */ * Do not optimize a conditional branch if PER enabled, because we
per_branch(s, true); * still need a conditional call to helper_per_branch.
ret = DISAS_NEXT; */
goto egress; if (c->cond == TCG_COND_ALWAYS
} || (dest == s->pc_tmp &&
if (c->cond == TCG_COND_ALWAYS) { !(s->base.tb->flags & FLAG_MASK_PER_BRANCH))) {
ret = help_goto_direct(s, dest); ret = help_goto_direct(s, dest);
goto egress; goto egress;
} }