Commit 20e62dd8 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

target/arm/vfp_helper: Move code around 



To ease the review of the next commit,
move the vfp_exceptbits_to_host() function directly after
vfp_exceptbits_from_host().  Amusingly the diff shows we
are moving vfp_get_fpscr().

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190701132516.26392-15-philmd@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent e21b551c

target/arm/vfp_helper.c

+26 −26
Original line number Diff line number Diff line
@@ -55,32 +55,6 @@ static inline int vfp_exceptbits_from_host(int host_bits) 
    return target_bits;

}



uint32_t HELPER(vfp_get_fpscr)(CPUARMState *env)

{

    uint32_t i, fpscr;



    fpscr = env->vfp.xregs[ARM_VFP_FPSCR]

            | (env->vfp.vec_len << 16)

            | (env->vfp.vec_stride << 20);



    i = get_float_exception_flags(&env->vfp.fp_status);

    i |= get_float_exception_flags(&env->vfp.standard_fp_status);

    /* FZ16 does not generate an input denormal exception.  */

    i |= (get_float_exception_flags(&env->vfp.fp_status_f16)

          & ~float_flag_input_denormal);

    fpscr |= vfp_exceptbits_from_host(i);



    i = env->vfp.qc[0] | env->vfp.qc[1] | env->vfp.qc[2] | env->vfp.qc[3];

    fpscr |= i ? FPCR_QC : 0;



    return fpscr;

}



uint32_t vfp_get_fpscr(CPUARMState *env)

{

    return HELPER(vfp_get_fpscr)(env);

}



/* Convert vfp exception flags to target form.  */

static inline int vfp_exceptbits_to_host(int target_bits)

{
@@ -107,6 +81,32 @@ static inline int vfp_exceptbits_to_host(int target_bits) 
    return host_bits;

}



uint32_t HELPER(vfp_get_fpscr)(CPUARMState *env)

{

    uint32_t i, fpscr;



    fpscr = env->vfp.xregs[ARM_VFP_FPSCR]

            | (env->vfp.vec_len << 16)

            | (env->vfp.vec_stride << 20);



    i = get_float_exception_flags(&env->vfp.fp_status);

    i |= get_float_exception_flags(&env->vfp.standard_fp_status);

    /* FZ16 does not generate an input denormal exception.  */

    i |= (get_float_exception_flags(&env->vfp.fp_status_f16)

          & ~float_flag_input_denormal);

    fpscr |= vfp_exceptbits_from_host(i);



    i = env->vfp.qc[0] | env->vfp.qc[1] | env->vfp.qc[2] | env->vfp.qc[3];

    fpscr |= i ? FPCR_QC : 0;



    return fpscr;

}



uint32_t vfp_get_fpscr(CPUARMState *env)

{

    return HELPER(vfp_get_fpscr)(env);

}



void HELPER(vfp_set_fpscr)(CPUARMState *env, uint32_t val)

{

    int i;