[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/10] target/s390x: Introduce gen_psw_addr_disp
From: |
Richard Henderson |
Subject: |
[PATCH v2 02/10] target/s390x: Introduce gen_psw_addr_disp |
Date: |
Wed, 5 Jun 2024 14:57:31 -0700 |
In preparation for TARGET_TB_PCREL, reduce reliance on absolute values.
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg/translate.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index f25ae02a4e..bd4ad33802 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -167,6 +167,11 @@ static uint64_t inline_branch_hit[CC_OP_MAX];
static uint64_t inline_branch_miss[CC_OP_MAX];
#endif
+static void gen_psw_addr_disp(DisasContext *s, TCGv_i64 dest, int64_t disp)
+{
+ tcg_gen_movi_i64(dest, s->base.pc_next + disp);
+}
+
static void pc_to_link_info(TCGv_i64 out, DisasContext *s, uint64_t pc)
{
if (s->base.tb->flags & FLAG_MASK_32) {
@@ -337,8 +342,7 @@ static void store_freg32_i64(int reg, TCGv_i64 v)
static void update_psw_addr(DisasContext *s)
{
- /* psw.addr */
- tcg_gen_movi_i64(psw_addr, s->base.pc_next);
+ gen_psw_addr_disp(s, psw_addr, 0);
}
static void per_branch(DisasContext *s, TCGv_i64 dest)
@@ -352,7 +356,7 @@ static void per_branch(DisasContext *s, TCGv_i64 dest)
static void per_breaking_event(DisasContext *s)
{
- tcg_gen_movi_i64(gbea, s->base.pc_next);
+ gen_psw_addr_disp(s, gbea, 0);
}
static void update_cc_op(DisasContext *s)
@@ -1086,11 +1090,11 @@ static DisasJumpType help_goto_direct(DisasContext *s,
int64_t disp)
}
if (use_goto_tb(s, dest)) {
tcg_gen_goto_tb(0);
- tcg_gen_movi_i64(psw_addr, dest);
+ gen_psw_addr_disp(s, psw_addr, disp);
tcg_gen_exit_tb(s->base.tb, 0);
return DISAS_NORETURN;
} else {
- tcg_gen_movi_i64(psw_addr, dest);
+ gen_psw_addr_disp(s, psw_addr, disp);
return DISAS_PC_CC_UPDATED;
}
}
@@ -1121,7 +1125,7 @@ static DisasJumpType help_branch(DisasContext *s,
DisasCompare *c,
* still need a conditional call to helper_per_branch.
*/
if (c->cond == TCG_COND_ALWAYS
- || (dest == s->pc_tmp &&
+ || (disp == s->ilen &&
!(s->base.tb->flags & FLAG_MASK_PER_BRANCH))) {
return help_goto_direct(s, disp);
}
@@ -1154,7 +1158,7 @@ static DisasJumpType help_branch(DisasContext *s,
DisasCompare *c,
/* Branch taken. */
per_breaking_event(s);
if (is_imm) {
- tcg_gen_movi_i64(psw_addr, dest);
+ gen_psw_addr_disp(s, psw_addr, disp);
} else {
tcg_gen_mov_i64(psw_addr, cdest);
}
@@ -1170,7 +1174,7 @@ static DisasJumpType help_branch(DisasContext *s,
DisasCompare *c,
gen_set_label(lab);
/* Branch not taken. */
- tcg_gen_movi_i64(psw_addr, s->pc_tmp);
+ gen_psw_addr_disp(s, psw_addr, s->ilen);
if (use_goto_tb(s, s->pc_tmp)) {
tcg_gen_goto_tb(1);
tcg_gen_exit_tb(s->base.tb, 1);
@@ -5758,7 +5762,8 @@ static TCGv gen_ri2(DisasContext *s)
disas_jdest(s, i2, is_imm, imm, ri2);
if (is_imm) {
- ri2 = tcg_constant_i64(s->base.pc_next + (int64_t)imm * 2);
+ ri2 = tcg_temp_new_i64();
+ gen_psw_addr_disp(s, ri2, (int64_t)imm * 2);
}
return ri2;
@@ -6367,7 +6372,7 @@ static DisasJumpType translate_one(CPUS390XState *env,
DisasContext *s)
s->base.is_jmp = DISAS_PC_CC_UPDATED;
/* fall through */
case DISAS_NEXT:
- tcg_gen_movi_i64(psw_addr, s->pc_tmp);
+ gen_psw_addr_disp(s, psw_addr, s->ilen);
break;
default:
break;
--
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 <=
- [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, 2024/06/05
- [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