On 31.05.19 12:44, David Hildenbrand wrote:
> We can reuse float64_dcmask().
>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
> ---
> target/s390x/helper.h | 2 ++
> target/s390x/insn-data.def | 2 ++
> target/s390x/translate_vx.inc.c | 21 ++++++++++++++++++
> target/s390x/vec_fpu_helper.c | 39 +++++++++++++++++++++++++++++++++
> 4 files changed, 64 insertions(+)
>
> diff --git a/target/s390x/helper.h b/target/s390x/helper.h
> index c788fc1b7f..e9aff83b05 100644
> --- a/target/s390x/helper.h
> +++ b/target/s390x/helper.h
> @@ -292,6 +292,8 @@ DEF_HELPER_FLAGS_4(gvec_vfsq64, TCG_CALL_NO_WG, void,
> ptr, cptr, env, i32)
> DEF_HELPER_FLAGS_4(gvec_vfsq64s, TCG_CALL_NO_WG, void, ptr, cptr, env, i32)
> DEF_HELPER_FLAGS_5(gvec_vfs64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env,
> i32)
> DEF_HELPER_FLAGS_5(gvec_vfs64s, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env,
> i32)
> +DEF_HELPER_4(gvec_vftci64, void, ptr, cptr, env, i32)
> +DEF_HELPER_4(gvec_vftci64s, void, ptr, cptr, env, i32)
>
> #ifndef CONFIG_USER_ONLY
> DEF_HELPER_3(servc, i32, env, i64, i64)
> diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def
> index 4426f40250..f421184fcd 100644
> --- a/target/s390x/insn-data.def
> +++ b/target/s390x/insn-data.def
> @@ -1246,6 +1246,8 @@
> F(0xe7ce, VFSQ, VRR_a, V, 0, 0, 0, 0, vfsq, 0, IF_VEC)
> /* VECTOR FP SUBTRACT */
> F(0xe7e2, VFS, VRR_c, V, 0, 0, 0, 0, vfa, 0, IF_VEC)
> +/* VECTOR FP TEST DATA CLASS IMMEDIATE */
> + F(0xe74a, VFTCI, VRI_e, V, 0, 0, 0, 0, vftci, 0, IF_VEC)
>
> #ifndef CONFIG_USER_ONLY
> /* COMPARE AND SWAP AND PURGE */
> diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.inc.c
> index bc75a147b6..715fcb2cb5 100644
> --- a/target/s390x/translate_vx.inc.c
> +++ b/target/s390x/translate_vx.inc.c
> @@ -2791,3 +2791,24 @@ static DisasJumpType op_vfsq(DisasContext *s, DisasOps
> *o)
> 0, fn);
> return DISAS_NEXT;
> }
> +
> +static DisasJumpType op_vftci(DisasContext *s, DisasOps *o)
> +{
> + const uint16_t i3 = get_field(s->fields, i3);
> + const uint8_t fpf = get_field(s->fields, m4);
> + const uint8_t m5 = get_field(s->fields, m5);
> + gen_helper_gvec_2_ptr *fn = gen_helper_gvec_vftci64;
> +
> + if (fpf != FPF_LONG || extract32(m5, 0, 3)) {
> + gen_program_exception(s, PGM_SPECIFICATION);
> + return DISAS_NORETURN;
> + }
> +
> + if (extract32(m5, 3, 1)) {
> + fn = gen_helper_gvec_vftci64s;
> + }
> + gen_gvec_2_ptr(get_field(s->fields, v1), get_field(s->fields, v2),
> cpu_env,
> + i3, fn);
> + set_cc_static(s);
> + return DISAS_NEXT;
> +}
> diff --git a/target/s390x/vec_fpu_helper.c b/target/s390x/vec_fpu_helper.c
> index 10249c5105..930b6d1db4 100644
> --- a/target/s390x/vec_fpu_helper.c
> +++ b/target/s390x/vec_fpu_helper.c
> @@ -603,3 +603,42 @@ void HELPER(gvec_vfs64s)(void *v1, const void *v2, const
> void *v3,
> {
> vop64_3(v1, v2, v3, env, true, vfs64, GETPC());
> }
> +
> +static int vftci64(S390Vector *v1, const S390Vector *v2, CPUS390XState *env,
> + bool s, uint16_t i3)
> +{
> + int i, match = 0;
> +
> + for (i = 0; i < 2; i++) {
> + float64 a = make_float64(s390_vec_read_element64(v2, i));
> +
> + if (float64_dcmask(env, a) & i3) {
> + match++;
> + s390_vec_write_element64(v1, i, -1ull);
> + } else {
> + s390_vec_write_element64(v1, i, 0);
> + }
> + if (s) {
> + break;
> + }
> + }
> +
> + if (match == i + 1) {
> + return 0;
> + } else if (match) {
> + return 1;
> + }
This is also wrong, similar to the other function.
--
Thanks,
David / dhildenb
