| Message ID | 20190921043256.4575-6-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/alpha: Fix linux-user exception for CVTTQ | expand |
On 9/21/19 6:32 AM, Richard Henderson wrote: > Tidy the computation of the value; no functional change. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/alpha/helper.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/target/alpha/helper.c b/target/alpha/helper.c > index 2f959c65ef..1b3479738b 100644 > --- a/target/alpha/helper.c > +++ b/target/alpha/helper.c > @@ -69,14 +69,13 @@ void cpu_alpha_store_fpcr(CPUAlphaState *env, uint64_t val) > env->fpcr_exc_enable = ~t & FPCR_STATUS_MASK; > > env->fpcr_dyn_round = rm_map[(fpcr & FPCR_DYN_MASK) >> FPCR_DYN_SHIFT]; > - > - env->fpcr_flush_to_zero = (fpcr & FPCR_UNFD) && (fpcr & FPCR_UNDZ); > env->fp_status.flush_inputs_to_zero = (fpcr & FPCR_DNZ) != 0; > + > + t = (fpcr & FPCR_UNFD) && (fpcr & FPCR_UNDZ); > #ifdef CONFIG_USER_ONLY > - if (env->swcr & SWCR_MAP_UMZ) { > - env->fpcr_flush_to_zero = 1; > - } > + t |= (env->swcr & SWCR_MAP_UMZ) != 0; > #endif > + env->fpcr_flush_to_zero = t; > } > > uint64_t helper_load_fpcr(CPUAlphaState *env) >
Richard Henderson <richard.henderson@linaro.org> writes: > Tidy the computation of the value; no functional change. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/alpha/helper.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/target/alpha/helper.c b/target/alpha/helper.c > index 2f959c65ef..1b3479738b 100644 > --- a/target/alpha/helper.c > +++ b/target/alpha/helper.c > @@ -69,14 +69,13 @@ void cpu_alpha_store_fpcr(CPUAlphaState *env, uint64_t val) > env->fpcr_exc_enable = ~t & FPCR_STATUS_MASK; > > env->fpcr_dyn_round = rm_map[(fpcr & FPCR_DYN_MASK) >> FPCR_DYN_SHIFT]; > - > - env->fpcr_flush_to_zero = (fpcr & FPCR_UNFD) && (fpcr & FPCR_UNDZ); > env->fp_status.flush_inputs_to_zero = (fpcr & FPCR_DNZ) != 0; > + > + t = (fpcr & FPCR_UNFD) && (fpcr & FPCR_UNDZ); > #ifdef CONFIG_USER_ONLY > - if (env->swcr & SWCR_MAP_UMZ) { > - env->fpcr_flush_to_zero = 1; > - } > + t |= (env->swcr & SWCR_MAP_UMZ) != 0; > #endif > + env->fpcr_flush_to_zero = t; > } > > uint64_t helper_load_fpcr(CPUAlphaState *env) -- Alex Bennée
diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 2f959c65ef..1b3479738b 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -69,14 +69,13 @@ void cpu_alpha_store_fpcr(CPUAlphaState *env, uint64_t val) env->fpcr_exc_enable = ~t & FPCR_STATUS_MASK; env->fpcr_dyn_round = rm_map[(fpcr & FPCR_DYN_MASK) >> FPCR_DYN_SHIFT]; - - env->fpcr_flush_to_zero = (fpcr & FPCR_UNFD) && (fpcr & FPCR_UNDZ); env->fp_status.flush_inputs_to_zero = (fpcr & FPCR_DNZ) != 0; + + t = (fpcr & FPCR_UNFD) && (fpcr & FPCR_UNDZ); #ifdef CONFIG_USER_ONLY - if (env->swcr & SWCR_MAP_UMZ) { - env->fpcr_flush_to_zero = 1; - } + t |= (env->swcr & SWCR_MAP_UMZ) != 0; #endif + env->fpcr_flush_to_zero = t; } uint64_t helper_load_fpcr(CPUAlphaState *env)
Tidy the computation of the value; no functional change. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/alpha/helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.17.1