[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 08/26] target/s390x: Use gen_psw_addr_disp in pc_to_link_info
From: |
Richard Henderson |
Subject: |
[PATCH v1 08/26] target/s390x: Use gen_psw_addr_disp in pc_to_link_info |
Date: |
Tue, 6 Sep 2022 11:17:29 +0100 |
This is slightly more complicated that a straight displacement
for 31 and 24-bit modes. Dont bother with a cant-happen assert.
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 7c98a72ddd..4c3ea958d7 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 v1 00/26] target/s390x: pc-relative translation, Richard Henderson, 2022/09/06
- [PATCH v1 02/26] target/s390x: Use tcg_constant_* for DisasCompare, Richard Henderson, 2022/09/06
- [PATCH v1 01/26] target/s390x: Use tcg_constant_* in local contexts, Richard Henderson, 2022/09/06
- [PATCH v1 03/26] target/s390x: Use tcg_constant_i32 for fpinst_extract_m34, Richard Henderson, 2022/09/06
- [PATCH v1 04/26] target/s390x: Use tcg_constant_* in translate_vx.c.inc, Richard Henderson, 2022/09/06
- [PATCH v1 05/26] target/s390x: Change help_goto_direct to work on displacements, Richard Henderson, 2022/09/06
- [PATCH v1 08/26] target/s390x: Use gen_psw_addr_disp in pc_to_link_info,
Richard Henderson <=
- [PATCH v1 09/26] target/s390x: Use gen_psw_addr_disp in save_link_info, Richard Henderson, 2022/09/06
- [PATCH v1 10/26] target/s390x: Use gen_psw_addr_disp in op_sam, Richard Henderson, 2022/09/06
- [PATCH v1 06/26] target/s390x: Introduce gen_psw_addr_disp, Richard Henderson, 2022/09/06
- [PATCH v1 12/26] target/s390x: Move masking of psw.addr to cpu_get_tb_cpu_state, Richard Henderson, 2022/09/06
- [PATCH v1 18/26] target/s390x: Split per_branch, Richard Henderson, 2022/09/06
- [PATCH v1 19/26] target/s390x: Simplify help_branch, Richard Henderson, 2022/09/06
- [PATCH v1 14/26] target/s390x: Don't set gbea for user-only, Richard Henderson, 2022/09/06
- [PATCH v1 20/26] target/s390x: Split per_breaking_event from per_branch_*, Richard Henderson, 2022/09/06
- [PATCH v1 13/26] target/s390x: Add disp argument to update_psw_addr, Richard Henderson, 2022/09/06