Commit bdcfcd44 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: Implement rounding mode and XxC for LOAD ROUNDED 



With the floating-point extension facility, LOAD ROUNDED has
a rounding mode specification and the inexact-exception control (XxC).

Handle them just like e.g. LOAD FP INTEGER.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20190218122710.23639-14-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent dce0a58f

target/s390x/fpu_helper.c

+17 −6
Original line number Diff line number Diff line
@@ -317,10 +317,14 @@ uint64_t HELPER(ldeb)(CPUS390XState *env, uint64_t f2) 
}



/* convert 128-bit float to 64-bit float */

uint64_t HELPER(ldxb)(CPUS390XState *env, uint64_t ah, uint64_t al)

uint64_t HELPER(ldxb)(CPUS390XState *env, uint64_t ah, uint64_t al,

                      uint32_t m34)

{

    int old_mode = s390_swap_bfp_rounding_mode(env, round_from_m34(m34));

    float64 ret = float128_to_float64(make_float128(ah, al), &env->fpu_status);

    handle_exceptions(env, false, GETPC());



    s390_restore_bfp_rounding_mode(env, old_mode);

    handle_exceptions(env, xxc_from_m34(m34), GETPC());

    return ret;

}
@@ -341,18 +345,25 @@ uint64_t HELPER(lxeb)(CPUS390XState *env, uint64_t f2) 
}



/* convert 64-bit float to 32-bit float */

uint64_t HELPER(ledb)(CPUS390XState *env, uint64_t f2)

uint64_t HELPER(ledb)(CPUS390XState *env, uint64_t f2, uint32_t m34)

{

    int old_mode = s390_swap_bfp_rounding_mode(env, round_from_m34(m34));

    float32 ret = float64_to_float32(f2, &env->fpu_status);

    handle_exceptions(env, false, GETPC());



    s390_restore_bfp_rounding_mode(env, old_mode);

    handle_exceptions(env, xxc_from_m34(m34), GETPC());

    return ret;

}



/* convert 128-bit float to 32-bit float */

uint64_t HELPER(lexb)(CPUS390XState *env, uint64_t ah, uint64_t al)

uint64_t HELPER(lexb)(CPUS390XState *env, uint64_t ah, uint64_t al,

                      uint32_t m34)

{

    int old_mode = s390_swap_bfp_rounding_mode(env, round_from_m34(m34));

    float32 ret = float128_to_float32(make_float128(ah, al), &env->fpu_status);

    handle_exceptions(env, false, GETPC());



    s390_restore_bfp_rounding_mode(env, old_mode);

    handle_exceptions(env, xxc_from_m34(m34), GETPC());

    return ret;

}

target/s390x/helper.h

+3 −3
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ DEF_HELPER_FLAGS_3(mdb, TCG_CALL_NO_WG, i64, env, i64, i64) 
DEF_HELPER_FLAGS_5(mxb, TCG_CALL_NO_WG, i64, env, i64, i64, i64, i64)

DEF_HELPER_FLAGS_4(mxdb, TCG_CALL_NO_WG, i64, env, i64, i64, i64)

DEF_HELPER_FLAGS_2(ldeb, TCG_CALL_NO_WG, i64, env, i64)

DEF_HELPER_FLAGS_3(ldxb, TCG_CALL_NO_WG, i64, env, i64, i64)

DEF_HELPER_FLAGS_4(ldxb, TCG_CALL_NO_WG, i64, env, i64, i64, i32)

DEF_HELPER_FLAGS_2(lxdb, TCG_CALL_NO_WG, i64, env, i64)

DEF_HELPER_FLAGS_2(lxeb, TCG_CALL_NO_WG, i64, env, i64)

DEF_HELPER_FLAGS_2(ledb, TCG_CALL_NO_WG, i64, env, i64)

DEF_HELPER_FLAGS_3(lexb, TCG_CALL_NO_WG, i64, env, i64, i64)

DEF_HELPER_FLAGS_3(ledb, TCG_CALL_NO_WG, i64, env, i64, i32)

DEF_HELPER_FLAGS_4(lexb, TCG_CALL_NO_WG, i64, env, i64, i64, i32)

DEF_HELPER_FLAGS_3(ceb, TCG_CALL_NO_WG_SE, i32, env, i64, i64)

DEF_HELPER_FLAGS_3(cdb, TCG_CALL_NO_WG_SE, i32, env, i64, i64)

DEF_HELPER_FLAGS_5(cxb, TCG_CALL_NO_WG_SE, i32, env, i64, i64, i64, i64)

target/s390x/insn-data.def

+3 −3
Original line number Diff line number Diff line
@@ -603,9 +603,9 @@ 
    F(0xb324, LDER,    RXE,   Z,   0, e2, new, f1, lde, 0, IF_AFP1)

    F(0xed24, LDE,     RXE,   Z,   0, m2_32u, new, f1, lde, 0, IF_AFP1)

/* LOAD ROUNDED */

    F(0xb344, LEDBR,   RRE,   Z,   0, f2, new, e1, ledb, 0, IF_BFP)

    F(0xb345, LDXBR,   RRE,   Z,   x2h, x2l, new, f1, ldxb, 0, IF_BFP)

    F(0xb346, LEXBR,   RRE,   Z,   x2h, x2l, new, e1, lexb, 0, IF_BFP)

    F(0xb344, LEDBR,   RRF_e, Z,   0, f2, new, e1, ledb, 0, IF_BFP)

    F(0xb345, LDXBR,   RRF_e, Z,   x2h, x2l, new, f1, ldxb, 0, IF_BFP)

    F(0xb346, LEXBR,   RRF_e, Z,   x2h, x2l, new, e1, lexb, 0, IF_BFP)



/* LOAD MULTIPLE */

    C(0x9800, LM,      RS_a,  Z,   0, a2, 0, 0, lm32, 0)

target/s390x/translate.c

+21 −3
Original line number Diff line number Diff line
@@ -2805,19 +2805,37 @@ static DisasJumpType op_ldeb(DisasContext *s, DisasOps *o) 


static DisasJumpType op_ledb(DisasContext *s, DisasOps *o)

{

    gen_helper_ledb(o->out, cpu_env, o->in2);

    TCGv_i32 m34 = fpinst_extract_m34(s, true, true);



    if (!m34) {

        return DISAS_NORETURN;

    }

    gen_helper_ledb(o->out, cpu_env, o->in2, m34);

    tcg_temp_free_i32(m34);

    return DISAS_NEXT;

}



static DisasJumpType op_ldxb(DisasContext *s, DisasOps *o)

{

    gen_helper_ldxb(o->out, cpu_env, o->in1, o->in2);

    TCGv_i32 m34 = fpinst_extract_m34(s, true, true);



    if (!m34) {

        return DISAS_NORETURN;

    }

    gen_helper_ldxb(o->out, cpu_env, o->in1, o->in2, m34);

    tcg_temp_free_i32(m34);

    return DISAS_NEXT;

}



static DisasJumpType op_lexb(DisasContext *s, DisasOps *o)

{

    gen_helper_lexb(o->out, cpu_env, o->in1, o->in2);

    TCGv_i32 m34 = fpinst_extract_m34(s, true, true);



    if (!m34) {

        return DISAS_NORETURN;

    }

    gen_helper_lexb(o->out, cpu_env, o->in1, o->in2, m34);

    tcg_temp_free_i32(m34);

    return DISAS_NEXT;

}