[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 05/26] target/s390x: Change help_goto_direct to work on displa
From: |
Richard Henderson |
Subject: |
[PATCH v1 05/26] target/s390x: Change help_goto_direct to work on displacements |
Date: |
Tue, 6 Sep 2022 11:17:26 +0100 |
In preparation for TARGET_TB_PCREL, reduce reliance on absolute values.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg/translate.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index f8cfddc181..b6e4005670 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -1145,8 +1145,10 @@ struct DisasInsn {
/* ====================================================================== */
/* Miscellaneous helpers, used by several operations. */
-static DisasJumpType help_goto_direct(DisasContext *s, uint64_t dest)
+static DisasJumpType help_goto_direct(DisasContext *s, int64_t disp)
{
+ uint64_t dest = s->base.pc_next + disp;
+
if (dest == s->pc_tmp) {
per_branch(s, true);
return DISAS_NEXT;
@@ -1169,7 +1171,8 @@ static DisasJumpType help_branch(DisasContext *s,
DisasCompare *c,
bool is_imm, int imm, TCGv_i64 cdest)
{
DisasJumpType ret;
- uint64_t dest = s->base.pc_next + (int64_t)imm * 2;
+ int64_t disp = (int64_t)imm * 2;
+ uint64_t dest = s->base.pc_next + disp;
TCGLabel *lab;
/* Take care of the special cases first. */
@@ -1185,7 +1188,7 @@ static DisasJumpType help_branch(DisasContext *s,
DisasCompare *c,
goto egress;
}
if (c->cond == TCG_COND_ALWAYS) {
- ret = help_goto_direct(s, dest);
+ ret = help_goto_direct(s, disp);
goto egress;
}
} else {
@@ -1558,7 +1561,7 @@ static DisasJumpType op_bal(DisasContext *s, DisasOps *o)
static DisasJumpType op_basi(DisasContext *s, DisasOps *o)
{
pc_to_link_info(o->out, s, s->pc_tmp);
- return help_goto_direct(s, s->base.pc_next + (int64_t)get_field(s, i2) *
2);
+ return help_goto_direct(s, (int64_t)get_field(s, i2) * 2);
}
static DisasJumpType op_bc(DisasContext *s, DisasOps *o)
--
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 <=
- [PATCH v1 07/26] target/s390x: Remove pc argument to pc_to_link_into, Richard Henderson, 2022/09/06
- [PATCH v1 06/26] target/s390x: Introduce gen_psw_addr_disp, Richard Henderson, 2022/09/06
- [PATCH v1 17/26] target/s390x: Introduce help_goto_indirect, Richard Henderson, 2022/09/06
- [PATCH v1 13/26] target/s390x: Add disp argument to update_psw_addr, Richard Henderson, 2022/09/06
- [PATCH v1 22/26] target/s390x: Pass original r2 register to BCR, 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 11/26] target/s390x: Use ilen instead in branches, Richard Henderson, 2022/09/06
- [PATCH v1 09/26] target/s390x: Use gen_psw_addr_disp in save_link_info, Richard Henderson, 2022/09/06