[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/27] target/s390x: Use gen_psw_addr_disp in pc_to_link_info
From: |
Richard Henderson |
Subject: |
[PATCH v3 10/27] target/s390x: Use gen_psw_addr_disp in pc_to_link_info |
Date: |
Mon, 9 Jan 2023 12:08:02 -0800 |
This is slightly more complicated than a straight displacement
for 31 and 24-bit modes. Dont bother with a cant-happen assert.
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg/translate.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index fadb87ad4a..05a11df00e 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -176,17 +176,20 @@ static void gen_psw_addr_disp(DisasContext *s, TCGv_i64
dest, int64_t disp)
static void pc_to_link_info(TCGv_i64 out, DisasContext *s)
{
- uint64_t pc = s->pc_tmp;
+ TCGv_i64 tmp;
- if (s->base.tb->flags & FLAG_MASK_32) {
- if (s->base.tb->flags & FLAG_MASK_64) {
- tcg_gen_movi_i64(out, pc);
- return;
- }
- pc |= 0x80000000;
+ if (s->base.tb->flags & FLAG_MASK_64) {
+ gen_psw_addr_disp(s, out, s->ilen);
+ return;
}
- assert(!(s->base.tb->flags & FLAG_MASK_64));
- tcg_gen_deposit_i64(out, out, tcg_constant_i64(pc), 0, 32);
+
+ tmp = tcg_temp_new_i64();
+ gen_psw_addr_disp(s, tmp, s->ilen);
+ if (s->base.tb->flags & FLAG_MASK_32) {
+ tcg_gen_ori_i64(tmp, tmp, 0x80000000);
+ }
+ tcg_gen_deposit_i64(out, out, tmp, 0, 32);
+ tcg_temp_free_i64(tmp);
}
static TCGv_i64 psw_addr;
--
2.34.1
- [PATCH v3 00/27] target/s390x: pc-relative translation blocks, Richard Henderson, 2023/01/09
- [PATCH v3 02/27] target/s390x: Use tcg_constant_* for DisasCompare, Richard Henderson, 2023/01/09
- [PATCH v3 04/27] target/s390x: Use tcg_constant_* in translate_vx.c.inc, Richard Henderson, 2023/01/09
- [PATCH v3 03/27] target/s390x: Use tcg_constant_i32 for fpinst_extract_m34, Richard Henderson, 2023/01/09
- [PATCH v3 01/27] target/s390x: Use tcg_constant_* in local contexts, Richard Henderson, 2023/01/09
- [PATCH v3 05/27] tests/tcg/s390x: Add bal.S, Richard Henderson, 2023/01/09
- [PATCH v3 06/27] tests/tcg/s390x: Add sam.S, Richard Henderson, 2023/01/09
- [PATCH v3 08/27] target/s390x: Introduce gen_psw_addr_disp, Richard Henderson, 2023/01/09
- [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 <=
- [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, 2023/01/09
- [PATCH v3 19/27] target/s390x: Introduce help_goto_indirect, Richard Henderson, 2023/01/09