From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org
Subject: [PATCH v2 14/27] target/s390x: Assert masking of psw.addr in cpu_get_tb_cpu_state
Date: Sun, 11 Dec 2022 09:27:49 -0600 [thread overview]
Message-ID: <20221211152802.923900-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20221211152802.923900-1-richard.henderson@linaro.org>
When changing modes via SAM, we raise a specification exception if the
new PC is out of range. The masking in s390x_tr_init_disas_context
was too late to be correct, but may be removed. Add a debugging
assert in cpu_get_tb_cpu_state.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/cpu.h | 20 ++++++++++++++------
target/s390x/tcg/translate.c | 6 +-----
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 7d6d01325b..c7eeebfc53 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -379,17 +379,25 @@ static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)
}
static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc,
- target_ulong *cs_base, uint32_t *flags)
+ target_ulong *cs_base, uint32_t *pflags)
{
- *pc = env->psw.addr;
- *cs_base = env->ex_value;
- *flags = (env->psw.mask >> FLAG_MASK_PSW_SHIFT) & FLAG_MASK_PSW;
+ int flags = (env->psw.mask >> FLAG_MASK_PSW_SHIFT) & FLAG_MASK_PSW;
if (env->cregs[0] & CR0_AFP) {
- *flags |= FLAG_MASK_AFP;
+ flags |= FLAG_MASK_AFP;
}
if (env->cregs[0] & CR0_VECTOR) {
- *flags |= FLAG_MASK_VECTOR;
+ flags |= FLAG_MASK_VECTOR;
}
+ *pflags = flags;
+ *cs_base = env->ex_value;
+ *pc = env->psw.addr;
+#ifdef CONFIG_DEBUG_TCG
+ if (!(flags & FLAG_MASK_32)) {
+ assert(*pc <= 0xffffff);
+ } else if (!(flags & FLAG_MASK_64)) {
+ assert(*pc <= 0x7fffffff);
+ }
+#endif
}
/* PER bits from control register 9 */
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index c9afa28c60..fcf0c52b8d 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -6491,11 +6491,7 @@ static void s390x_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
{
DisasContext *dc = container_of(dcbase, DisasContext, base);
- /* 31-bit mode */
- if (!(dc->base.tb->flags & FLAG_MASK_64)) {
- dc->base.pc_first &= 0x7fffffff;
- dc->base.pc_next = dc->base.pc_first;
- }
+ /* Note cpu_get_tb_cpu_state asserts PC is masked for the mode. */
dc->cc_op = CC_OP_DYNAMIC;
dc->ex_value = dc->base.tb->cs_base;
--
2.34.1
next prev parent reply other threads:[~2022-12-11 15:30 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-11 15:27 [PATCH v2 00/27] target/s390x: pc-relative translation blocks Richard Henderson
2022-12-11 15:27 ` [PATCH v2 01/27] target/s390x: Use tcg_constant_* in local contexts Richard Henderson
2022-12-11 15:27 ` [PATCH v2 02/27] target/s390x: Use tcg_constant_* for DisasCompare Richard Henderson
2022-12-11 15:43 ` Philippe Mathieu-Daudé
2022-12-11 15:27 ` [PATCH v2 03/27] target/s390x: Use tcg_constant_i32 for fpinst_extract_m34 Richard Henderson
2022-12-11 15:44 ` Philippe Mathieu-Daudé
2022-12-11 15:27 ` [PATCH v2 04/27] target/s390x: Use tcg_constant_* in translate_vx.c.inc Richard Henderson
2022-12-11 15:45 ` Philippe Mathieu-Daudé
2022-12-11 15:27 ` [PATCH v2 05/27] tests/tcg/s390x: Add bal.S Richard Henderson
2022-12-11 15:27 ` [PATCH v2 06/27] tests/tcg/s390x: Add sam.S Richard Henderson
2022-12-11 15:27 ` [PATCH v2 07/27] target/s390x: Change help_goto_direct to work on displacements Richard Henderson
2022-12-11 15:47 ` Philippe Mathieu-Daudé
2022-12-11 15:27 ` [PATCH v2 08/27] target/s390x: Introduce gen_psw_addr_disp Richard Henderson
2022-12-11 15:27 ` [PATCH v2 09/27] target/s390x: Remove pc argument to pc_to_link_into Richard Henderson
2022-12-11 15:27 ` [PATCH v2 10/27] target/s390x: Use gen_psw_addr_disp in pc_to_link_info Richard Henderson
2022-12-11 15:27 ` [PATCH v2 11/27] target/s390x: Use gen_psw_addr_disp in save_link_info Richard Henderson
2022-12-11 15:27 ` [PATCH v2 12/27] target/s390x: Use gen_psw_addr_disp in op_sam Richard Henderson
2022-12-11 15:27 ` [PATCH v2 13/27] target/s390x: Use ilen instead in branches Richard Henderson
2022-12-11 15:52 ` Philippe Mathieu-Daudé
2022-12-11 15:27 ` Richard Henderson [this message]
2022-12-13 17:14 ` [PATCH v2 14/27] target/s390x: Assert masking of psw.addr in cpu_get_tb_cpu_state Ilya Leoshkevich
2022-12-11 15:27 ` [PATCH v2 15/27] target/s390x: Add disp argument to update_psw_addr Richard Henderson
2022-12-11 15:57 ` Philippe Mathieu-Daudé
2022-12-11 15:27 ` [PATCH v2 16/27] target/s390x: Don't set gbea for user-only Richard Henderson
2022-12-11 15:27 ` [PATCH v2 17/27] target/s390x: Introduce per_enabled Richard Henderson
2022-12-11 15:27 ` [PATCH v2 18/27] target/s390x: Disable conditional branch-to-next for PER Richard Henderson
2022-12-11 15:27 ` [PATCH v2 19/27] target/s390x: Introduce help_goto_indirect Richard Henderson
2022-12-11 15:58 ` Philippe Mathieu-Daudé
2022-12-13 17:15 ` Ilya Leoshkevich
2022-12-11 15:27 ` [PATCH v2 20/27] target/s390x: Split per_branch Richard Henderson
2022-12-11 15:27 ` [PATCH v2 21/27] target/s390x: Simplify help_branch Richard Henderson
2022-12-11 15:27 ` [PATCH v2 22/27] target/s390x: Split per_breaking_event from per_branch_* Richard Henderson
2022-12-11 15:27 ` [PATCH v2 23/27] target/s390x: Remove PER check from use_goto_tb Richard Henderson
2022-12-11 15:27 ` [PATCH v2 24/27] target/s390x: Fix successful-branch PER events Richard Henderson
2022-12-11 15:28 ` [PATCH v2 25/27] tests/tcg/s390x: Add per.S Richard Henderson
2022-12-11 15:28 ` [PATCH v2 26/27] target/s390x: Pass original r2 register to BCR Richard Henderson
2022-12-11 15:28 ` [PATCH v2 27/27] target/s390x: Enable TARGET_TB_PCREL Richard Henderson
2022-12-14 17:22 ` Ilya Leoshkevich
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=20221211152802.923900-15-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/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).