[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/10] target/s390x: Use gen_psw_addr_disp in op_sam
From: |
Richard Henderson |
Subject: |
[PATCH v2 07/10] target/s390x: Use gen_psw_addr_disp in op_sam |
Date: |
Wed, 5 Jun 2024 14:57:36 -0700 |
Complicated because we may now require a runtime jump.
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg/translate.c | 39 +++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 0f0688424f..bce9a0aeb0 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -3805,7 +3805,7 @@ static DisasJumpType op_sacf(DisasContext *s, DisasOps *o)
static DisasJumpType op_sam(DisasContext *s, DisasOps *o)
{
int sam = s->insn->data;
- TCGv_i64 tsam;
+ TCGLabel *fault = NULL;
uint64_t mask;
switch (sam) {
@@ -3820,20 +3820,35 @@ static DisasJumpType op_sam(DisasContext *s, DisasOps
*o)
break;
}
- /* Bizarre but true, we check the address of the current insn for the
- specification exception, not the next to be executed. Thus the PoO
- documents that Bad Things Happen two bytes before the end. */
- if (s->base.pc_next & ~mask) {
- gen_program_exception(s, PGM_SPECIFICATION);
- return DISAS_NORETURN;
- }
- s->pc_tmp &= mask;
+ /*
+ * Bizarre but true, we check the address of the current insn for the
+ * specification exception, not the next to be executed. Thus the PoO
+ * documents that Bad Things Happen two bytes before the end.
+ */
+ if (mask != -1) {
+ TCGv_i64 t = tcg_temp_new_i64();
+ fault = gen_new_label();
- tsam = tcg_constant_i64(sam);
- tcg_gen_deposit_i64(psw_mask, psw_mask, tsam, 31, 2);
+ gen_psw_addr_disp(s, t, 0);
+ tcg_gen_andi_i64(t, t, ~mask);
+ tcg_gen_brcondi_i64(TCG_COND_NE, t, 0, fault);
+ }
+
+ update_cc_op(s);
+
+ tcg_gen_deposit_i64(psw_mask, psw_mask, tcg_constant_i64(sam), 31, 2);
+
+ gen_psw_addr_disp(s, psw_addr, s->ilen);
+ tcg_gen_andi_i64(psw_addr, psw_addr, mask);
/* Always exit the TB, since we (may have) changed execution mode. */
- return DISAS_TOO_MANY;
+ tcg_gen_lookup_and_goto_ptr();
+
+ if (mask != -1) {
+ gen_set_label(fault);
+ gen_program_exception(s, PGM_SPECIFICATION);
+ }
+ return DISAS_NORETURN;
}
static DisasJumpType op_sar(DisasContext *s, DisasOps *o)
--
2.34.1
- [PATCH v2 00/10] target/s390x: pc-relative translation, Richard Henderson, 2024/06/05
- [PATCH v2 01/10] target/s390x: Change help_goto_direct to work on displacements, Richard Henderson, 2024/06/05
- [PATCH v2 02/10] target/s390x: Introduce gen_psw_addr_disp, Richard Henderson, 2024/06/05
- [PATCH v2 03/10] target/s390x: Remove pc argument to pc_to_link_into, Richard Henderson, 2024/06/05
- [PATCH v2 04/10] target/s390x: Use gen_psw_addr_disp in pc_to_link_info, Richard Henderson, 2024/06/05
- [PATCH v2 05/10] target/s390x: Use gen_psw_addr_disp in save_link_info, Richard Henderson, 2024/06/05
- [PATCH v2 06/10] target/s390x: Use deposit in save_link_info, Richard Henderson, 2024/06/05
- [PATCH v2 08/10] target/s390x: Use ilen instead in branches, Richard Henderson, 2024/06/05
- [PATCH v2 07/10] target/s390x: Use gen_psw_addr_disp in op_sam,
Richard Henderson <=
- [PATCH v2 09/10] target/s390x: Assert masking of psw.addr in cpu_get_tb_cpu_state, Richard Henderson, 2024/06/05
- [PATCH v2 10/10] target/s390x: Enable CF_PCREL, Richard Henderson, 2024/06/05