[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/27] target/s390x: Introduce per_enabled
From: |
Richard Henderson |
Subject: |
[PATCH v3 17/27] target/s390x: Introduce per_enabled |
Date: |
Mon, 9 Jan 2023 12:08:09 -0800 |
Hoist the test of FLAG_MASK_PER to a helper.
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg/translate.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index b84b0062ca..b02b76dfad 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -341,12 +341,21 @@ static void update_psw_addr_disp(DisasContext *s, int64_t
disp)
gen_psw_addr_disp(s, psw_addr, disp);
}
+static inline bool per_enabled(DisasContext *s)
+{
+#ifdef CONFIG_USER_ONLY
+ return false;
+#else
+ return unlikely(s->base.tb->flags & FLAG_MASK_PER);
+#endif
+}
+
static void per_branch(DisasContext *s, bool to_next)
{
#ifndef CONFIG_USER_ONLY
gen_psw_addr_disp(s, gbea, 0);
- if (s->base.tb->flags & FLAG_MASK_PER) {
+ if (per_enabled(s)) {
if (to_next) {
TCGv_i64 next_pc = tcg_temp_new_i64();
@@ -364,7 +373,7 @@ static void per_branch_cond(DisasContext *s, TCGCond cond,
TCGv_i64 arg1, TCGv_i64 arg2)
{
#ifndef CONFIG_USER_ONLY
- if (s->base.tb->flags & FLAG_MASK_PER) {
+ if (per_enabled(s)) {
TCGLabel *lab = gen_new_label();
tcg_gen_brcond_i64(tcg_invert_cond(cond), arg1, arg2, lab);
@@ -665,7 +674,7 @@ static void gen_op_calc_cc(DisasContext *s)
static bool use_goto_tb(DisasContext *s, uint64_t dest)
{
- if (unlikely(s->base.tb->flags & FLAG_MASK_PER)) {
+ if (per_enabled(s)) {
return false;
}
return translator_use_goto_tb(&s->base, dest);
@@ -4493,7 +4502,7 @@ static DisasJumpType op_stura(DisasContext *s, DisasOps
*o)
{
tcg_gen_qemu_st_tl(o->in1, o->in2, MMU_REAL_IDX, s->insn->data);
- if (s->base.tb->flags & FLAG_MASK_PER) {
+ if (per_enabled(s)) {
update_psw_addr_disp(s, 0);
gen_helper_per_store_real(cpu_env);
}
@@ -6351,7 +6360,7 @@ static DisasJumpType translate_one(CPUS390XState *env,
DisasContext *s)
}
#ifndef CONFIG_USER_ONLY
- if (s->base.tb->flags & FLAG_MASK_PER) {
+ if (per_enabled(s)) {
TCGv_i64 addr = tcg_temp_new_i64();
gen_psw_addr_disp(s, addr, 0);
@@ -6474,7 +6483,7 @@ static DisasJumpType translate_one(CPUS390XState *env,
DisasContext *s)
}
#ifndef CONFIG_USER_ONLY
- if (s->base.tb->flags & FLAG_MASK_PER) {
+ if (per_enabled(s)) {
/* An exception might be triggered, save PSW if not already done. */
if (ret == DISAS_NEXT || ret == DISAS_TOO_MANY) {
update_psw_addr_disp(s, s->ilen);
@@ -6499,7 +6508,7 @@ static void s390x_tr_init_disas_context(DisasContextBase
*dcbase, CPUState *cs)
dc->cc_op = CC_OP_DYNAMIC;
dc->ex_value = dc->base.tb->cs_base;
- dc->exit_to_mainloop = (dc->base.tb->flags & FLAG_MASK_PER) ||
dc->ex_value;
+ dc->exit_to_mainloop = per_enabled(dc) || dc->ex_value;
}
static void s390x_tr_tb_start(DisasContextBase *db, CPUState *cs)
--
2.34.1
- [PATCH v3 09/27] target/s390x: Remove pc argument to pc_to_link_into, (continued)
- [PATCH v3 09/27] target/s390x: Remove pc argument to pc_to_link_into, Richard Henderson, 2023/01/09
- [PATCH v3 10/27] target/s390x: Use gen_psw_addr_disp in pc_to_link_info, Richard Henderson, 2023/01/09
- [PATCH v3 11/27] target/s390x: Use gen_psw_addr_disp in save_link_info, Richard Henderson, 2023/01/09
- [PATCH v3 07/27] target/s390x: Change help_goto_direct to work on displacements, Richard Henderson, 2023/01/09
- [PATCH v3 12/27] target/s390x: Use gen_psw_addr_disp in op_sam, Richard Henderson, 2023/01/09
- [PATCH v3 13/27] target/s390x: Use ilen instead in branches, Richard Henderson, 2023/01/09
- [PATCH v3 15/27] target/s390x: Add disp argument to update_psw_addr, Richard Henderson, 2023/01/09
- [PATCH v3 16/27] target/s390x: Don't set gbea for user-only, Richard Henderson, 2023/01/09
- [PATCH v3 18/27] target/s390x: Disable conditional branch-to-next for PER, Richard Henderson, 2023/01/09
- [PATCH v3 14/27] target/s390x: Assert masking of psw.addr in cpu_get_tb_cpu_state, Richard Henderson, 2023/01/09
- [PATCH v3 17/27] target/s390x: Introduce per_enabled,
Richard Henderson <=
- [PATCH v3 19/27] target/s390x: Introduce help_goto_indirect, Richard Henderson, 2023/01/09
- [PATCH v3 20/27] target/s390x: Split per_branch, Richard Henderson, 2023/01/09
- [PATCH v3 21/27] target/s390x: Simplify help_branch, Richard Henderson, 2023/01/09
- [PATCH v3 22/27] target/s390x: Split per_breaking_event from per_branch_*, Richard Henderson, 2023/01/09
- [PATCH v3 23/27] target/s390x: Remove PER check from use_goto_tb, Richard Henderson, 2023/01/09
- [PATCH v3 24/27] target/s390x: Fix successful-branch PER events, Richard Henderson, 2023/01/09
- [PATCH v3 25/27] tests/tcg/s390x: Add per.S, Richard Henderson, 2023/01/09
- [PATCH v3 26/27] target/s390x: Pass original r2 register to BCR, Richard Henderson, 2023/01/09
- [PATCH v3 27/27] target/s390x: Enable TARGET_TB_PCREL, Richard Henderson, 2023/01/09