[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/40] target/s390x: Use Int128 for return from CKSM
From: |
Richard Henderson |
Subject: |
[PULL 30/40] target/s390x: Use Int128 for return from CKSM |
Date: |
Sat, 4 Feb 2023 06:33:00 -1000 |
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/helper.h | 2 +-
target/s390x/tcg/mem_helper.c | 7 +++----
target/s390x/tcg/translate.c | 6 ++++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/target/s390x/helper.h b/target/s390x/helper.h
index 25c2dd0b3c..03b29efa3e 100644
--- a/target/s390x/helper.h
+++ b/target/s390x/helper.h
@@ -103,7 +103,7 @@ DEF_HELPER_4(tre, i64, env, i64, i64, i64)
DEF_HELPER_4(trt, i32, env, i32, i64, i64)
DEF_HELPER_4(trtr, i32, env, i32, i64, i64)
DEF_HELPER_5(trXX, i32, env, i32, i32, i32, i32)
-DEF_HELPER_4(cksm, i64, env, i64, i64, i64)
+DEF_HELPER_4(cksm, i128, env, i64, i64, i64)
DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64)
DEF_HELPER_FLAGS_2(sfpc, TCG_CALL_NO_WG, void, env, i64)
DEF_HELPER_FLAGS_2(sfas, TCG_CALL_NO_WG, void, env, i64)
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 9be42851d8..b0b403e23a 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -1350,8 +1350,8 @@ uint32_t HELPER(clclu)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
}
/* checksum */
-uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1,
- uint64_t src, uint64_t src_len)
+Int128 HELPER(cksm)(CPUS390XState *env, uint64_t r1,
+ uint64_t src, uint64_t src_len)
{
uintptr_t ra = GETPC();
uint64_t max_len, len;
@@ -1392,8 +1392,7 @@ uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1,
env->cc_op = (len == src_len ? 0 : 3);
/* Return both cksm and processed length. */
- env->retxl = cksm;
- return len;
+ return int128_make128(cksm, len);
}
void HELPER(pack)(CPUS390XState *env, uint32_t len, uint64_t dest, uint64_t
src)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 8397fe2bd8..1a7aa9e4ae 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -2041,11 +2041,13 @@ static DisasJumpType op_cxlgb(DisasContext *s, DisasOps
*o)
static DisasJumpType op_cksm(DisasContext *s, DisasOps *o)
{
int r2 = get_field(s, r2);
+ TCGv_i128 pair = tcg_temp_new_i128();
TCGv_i64 len = tcg_temp_new_i64();
- gen_helper_cksm(len, cpu_env, o->in1, o->in2, regs[r2 + 1]);
+ gen_helper_cksm(pair, cpu_env, o->in1, o->in2, regs[r2 + 1]);
set_cc_static(s);
- return_low128(o->out);
+ tcg_gen_extr_i128_i64(o->out, len, pair);
+ tcg_temp_free_i128(pair);
tcg_gen_add_i64(regs[r2], regs[r2], len);
tcg_gen_sub_i64(regs[r2 + 1], regs[r2 + 1], len);
--
2.34.1
- [PULL 19/40] tcg: Split out tcg_gen_nonatomic_cmpxchg_i{32,64}, (continued)
- [PULL 19/40] tcg: Split out tcg_gen_nonatomic_cmpxchg_i{32,64}, Richard Henderson, 2023/02/04
- [PULL 21/40] target/arm: Use tcg_gen_atomic_cmpxchg_i128 for CASP, Richard Henderson, 2023/02/04
- [PULL 22/40] target/ppc: Use tcg_gen_atomic_cmpxchg_i128 for STQCX, Richard Henderson, 2023/02/04
- [PULL 23/40] tests/tcg/s390x: Add div.c, Richard Henderson, 2023/02/04
- [PULL 24/40] tests/tcg/s390x: Add clst.c, Richard Henderson, 2023/02/04
- [PULL 25/40] tests/tcg/s390x: Add long-double.c, Richard Henderson, 2023/02/04
- [PULL 26/40] tests/tcg/s390x: Add cdsg.c, Richard Henderson, 2023/02/04
- [PULL 27/40] target/s390x: Use a single return for helper_divs32/u32, Richard Henderson, 2023/02/04
- [PULL 28/40] target/s390x: Use a single return for helper_divs64/u64, Richard Henderson, 2023/02/04
- [PULL 29/40] target/s390x: Use Int128 for return from CLST, Richard Henderson, 2023/02/04
- [PULL 30/40] target/s390x: Use Int128 for return from CKSM,
Richard Henderson <=
- [PULL 31/40] target/s390x: Use Int128 for return from TRE, Richard Henderson, 2023/02/04
- [PULL 32/40] target/s390x: Copy wout_x1 to wout_x1_P, Richard Henderson, 2023/02/04
- [PULL 33/40] target/s390x: Use Int128 for returning float128, Richard Henderson, 2023/02/04
- [PULL 35/40] target/s390x: Use tcg_gen_atomic_cmpxchg_i128 for CDSG, Richard Henderson, 2023/02/04
- [PULL 36/40] target/s390x: Implement CC_OP_NZ in gen_op_calc_cc, Richard Henderson, 2023/02/04
- [PULL 34/40] target/s390x: Use Int128 for passing float128, Richard Henderson, 2023/02/04
- [PULL 38/40] target/i386: Inline cmpxchg8b, Richard Henderson, 2023/02/04
- [PULL 39/40] target/i386: Inline cmpxchg16b, Richard Henderson, 2023/02/04
- [PULL 37/40] target/i386: Split out gen_cmpxchg8b, gen_cmpxchg16b, Richard Henderson, 2023/02/04
- [PULL 40/40] tcg/aarch64: Fix patching of LDR in tb_target_set_jmp_target, Richard Henderson, 2023/02/04