mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/s390x: Split per_breaking_event from per_branch_*

Browse Source 
The breaking-event-address register is updated regardless
of PER being enabled.

Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240502054417.234340-9-richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Richard Henderson 2024-05-01 22:44:11 -07:00 committed by Thomas Huth
parent e640545523
commit 619f6891ff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/s390x/tcg/translate.c
View File

@ -344,8 +344,6 @@ static void update_psw_addr(DisasContext *s)
static void per_branch(DisasContext *s, bool to_next) static void per_branch(DisasContext *s, bool to_next)
{ {
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
tcg_gen_movi_i64(gbea, s->base.pc_next);
if (s->base.tb->flags & FLAG_MASK_PER_BRANCH) { if (s->base.tb->flags & FLAG_MASK_PER_BRANCH) {
TCGv_i64 next_pc = to_next ? tcg_constant_i64(s->pc_tmp) : psw_addr; TCGv_i64 next_pc = to_next ? tcg_constant_i64(s->pc_tmp) : psw_addr;
gen_helper_per_branch(tcg_env, gbea, next_pc); gen_helper_per_branch(tcg_env, gbea, next_pc);
@ -1081,13 +1079,13 @@ struct DisasInsn {
static DisasJumpType help_goto_direct(DisasContext *s, uint64_t dest) static DisasJumpType help_goto_direct(DisasContext *s, uint64_t dest)
{ {
per_breaking_event(s);
if (dest == s->pc_tmp) { if (dest == s->pc_tmp) {
per_branch(s, true); per_branch(s, true);
return DISAS_NEXT; return DISAS_NEXT;
} }
if (use_goto_tb(s, dest)) { if (use_goto_tb(s, dest)) {
update_cc_op(s); update_cc_op(s);
per_breaking_event(s);
tcg_gen_goto_tb(0); tcg_gen_goto_tb(0);
tcg_gen_movi_i64(psw_addr, dest); tcg_gen_movi_i64(psw_addr, dest);
tcg_gen_exit_tb(s->base.tb, 0); tcg_gen_exit_tb(s->base.tb, 0);
@ -1101,6 +1099,7 @@ static DisasJumpType help_goto_direct(DisasContext *s, uint64_t dest)
static DisasJumpType help_goto_indirect(DisasContext *s, TCGv_i64 dest) static DisasJumpType help_goto_indirect(DisasContext *s, TCGv_i64 dest)
{ {
per_breaking_event(s);
tcg_gen_mov_i64(psw_addr, dest); tcg_gen_mov_i64(psw_addr, dest);
per_branch(s, false); per_branch(s, false);
return DISAS_PC_UPDATED; return DISAS_PC_UPDATED;
@ -1159,6 +1158,7 @@ static DisasJumpType help_branch(DisasContext *s, DisasCompare *c,
} }
/* Branch taken. */ /* Branch taken. */
per_breaking_event(s);
if (is_imm) { if (is_imm) {
tcg_gen_movi_i64(psw_addr, dest); tcg_gen_movi_i64(psw_addr, dest);
} else { } else {