From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, qemu-s390x@nongnu.org,
Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH v4 20/27] target/s390x: Split per_branch
Date: Mon, 20 Feb 2023 08:40:45 -1000 [thread overview]
Message-ID: <20230220184052.163465-21-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230220184052.163465-1-richard.henderson@linaro.org>
Split into per_branch_dest and per_branch_disp, which can be
used for direct and indirect. In preperation for TARGET_TB_PCREL,
call per_branch_* before indirect branches.
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg/translate.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index afa5f56fc4..878b220bf6 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -362,21 +362,25 @@ static inline bool per_enabled(DisasContext *s)
#endif
}
-static void per_branch(DisasContext *s, bool to_next)
+static void per_branch_dest(DisasContext *s, TCGv_i64 dest)
{
#ifndef CONFIG_USER_ONLY
gen_psw_addr_disp(s, gbea, 0);
-
if (per_enabled(s)) {
- if (to_next) {
- TCGv_i64 next_pc = tcg_temp_new_i64();
+ gen_helper_per_branch(cpu_env, gbea, dest);
+ }
+#endif
+}
- gen_psw_addr_disp(s, next_pc, s->ilen);
- gen_helper_per_branch(cpu_env, gbea, next_pc);
- tcg_temp_free_i64(next_pc);
- } else {
- gen_helper_per_branch(cpu_env, gbea, psw_addr);
- }
+static void per_branch_disp(DisasContext *s, int64_t disp)
+{
+#ifndef CONFIG_USER_ONLY
+ gen_psw_addr_disp(s, gbea, 0);
+ if (per_enabled(s)) {
+ TCGv_i64 dest = tcg_temp_new_i64();
+ gen_psw_addr_disp(s, dest, disp);
+ gen_helper_per_branch(cpu_env, gbea, dest);
+ tcg_temp_free_i64(dest);
}
#endif
}
@@ -1188,7 +1192,7 @@ struct DisasInsn {
static DisasJumpType help_goto_direct(DisasContext *s, int64_t disp)
{
if (disp == s->ilen) {
- per_branch(s, true);
+ per_branch_disp(s, disp);
return DISAS_NEXT;
}
if (use_goto_tb(s, s->base.pc_next + disp)) {
@@ -1200,7 +1204,7 @@ static DisasJumpType help_goto_direct(DisasContext *s, int64_t disp)
return DISAS_NORETURN;
} else {
update_psw_addr_disp(s, disp);
- per_branch(s, false);
+ per_branch_dest(s, psw_addr);
return DISAS_PC_UPDATED;
}
}
@@ -1208,7 +1212,7 @@ static DisasJumpType help_goto_direct(DisasContext *s, int64_t disp)
static DisasJumpType help_goto_indirect(DisasContext *s, TCGv_i64 dest)
{
tcg_gen_mov_i64(psw_addr, dest);
- per_branch(s, false);
+ per_branch_dest(s, psw_addr);
return DISAS_PC_UPDATED;
}
--
2.34.1
next prev parent reply other threads:[~2023-02-20 18:42 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 18:40 [PATCH v4 00/27] target/s390x: pc-relative translation blocks Richard Henderson
2023-02-20 18:40 ` [PATCH v4 01/27] target/s390x: Use tcg_constant_* in local contexts Richard Henderson
2023-02-20 18:40 ` [PATCH v4 02/27] target/s390x: Use tcg_constant_* for DisasCompare Richard Henderson
2023-02-20 18:40 ` [PATCH v4 03/27] target/s390x: Use tcg_constant_i32 for fpinst_extract_m34 Richard Henderson
2023-02-20 18:40 ` [PATCH v4 04/27] target/s390x: Use tcg_constant_* in translate_vx.c.inc Richard Henderson
2023-02-20 18:40 ` [PATCH v4 05/27] tests/tcg/s390x: Add bal.S Richard Henderson
2023-02-20 18:40 ` [PATCH v4 06/27] tests/tcg/s390x: Add sam.S Richard Henderson
2023-02-20 18:40 ` [PATCH v4 07/27] target/s390x: Change help_goto_direct to work on displacements Richard Henderson
2023-02-20 18:40 ` [PATCH v4 08/27] target/s390x: Introduce gen_psw_addr_disp Richard Henderson
2023-02-20 18:40 ` [PATCH v4 09/27] target/s390x: Remove pc argument to pc_to_link_into Richard Henderson
2023-02-20 18:40 ` [PATCH v4 10/27] target/s390x: Use gen_psw_addr_disp in pc_to_link_info Richard Henderson
2023-02-20 18:40 ` [PATCH v4 11/27] target/s390x: Use gen_psw_addr_disp in save_link_info Richard Henderson
2023-02-20 18:40 ` [PATCH v4 12/27] target/s390x: Use gen_psw_addr_disp in op_sam Richard Henderson
2023-02-20 18:40 ` [PATCH v4 13/27] target/s390x: Use ilen instead in branches Richard Henderson
2023-02-20 18:40 ` [PATCH v4 14/27] target/s390x: Assert masking of psw.addr in cpu_get_tb_cpu_state Richard Henderson
2023-02-20 18:40 ` [PATCH v4 15/27] target/s390x: Add disp argument to update_psw_addr Richard Henderson
2023-02-20 18:40 ` [PATCH v4 16/27] target/s390x: Don't set gbea for user-only Richard Henderson
2023-02-20 18:40 ` [PATCH v4 17/27] target/s390x: Introduce per_enabled Richard Henderson
2023-02-20 18:40 ` [PATCH v4 18/27] target/s390x: Disable conditional branch-to-next for PER Richard Henderson
2023-02-20 18:40 ` [PATCH v4 19/27] target/s390x: Introduce help_goto_indirect Richard Henderson
2023-02-20 18:40 ` Richard Henderson [this message]
2023-02-20 18:40 ` [PATCH v4 21/27] target/s390x: Simplify help_branch Richard Henderson
2023-02-20 18:40 ` [PATCH v4 22/27] target/s390x: Split per_breaking_event from per_branch_* Richard Henderson
2023-02-20 18:40 ` [PATCH v4 23/27] target/s390x: Remove PER check from use_goto_tb Richard Henderson
2023-02-20 18:40 ` [PATCH v4 24/27] target/s390x: Fix successful-branch PER events Richard Henderson
2023-02-20 18:40 ` [PATCH v4 25/27] tests/tcg/s390x: Add per.S Richard Henderson
2023-02-20 18:40 ` [PATCH v4 26/27] target/s390x: Pass original r2 register to BCR Richard Henderson
2023-02-20 18:40 ` [PATCH v4 27/27] target/s390x: Enable TARGET_TB_PCREL Richard Henderson
2023-02-21 14:35 ` Thomas Huth
2023-02-21 15:53 ` Richard Henderson
2023-02-27 11:41 ` Thomas Huth
2023-03-02 13:03 ` Thomas Huth
2023-03-02 18:05 ` Richard Henderson
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=20230220184052.163465-21-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=iii@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).