From 8cd99905267335267ed8365ead3a77a0920ea532 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 20 Sep 2019 21:32:53 -0700 Subject: [PATCH] target/alpha: Handle SWCR_MAP_DMZ earlier MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since we're converting the swcr to fpcr format for exceptions, it's trivial to add FPCR_DNZ to the set of fpcr bits overriden. No functional change. Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20190921043256.4575-5-richard.henderson@linaro.org> --- target/alpha/helper.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/target/alpha/helper.c b/target/alpha/helper.c index e21c488aa3..2f959c65ef 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -57,7 +57,7 @@ void cpu_alpha_store_fpcr(CPUAlphaState *env, uint64_t val) * the software exception mask. */ uint32_t soft_fpcr = alpha_ieee_swcr_to_fpcr(env->swcr) >> 32; - fpcr |= soft_fpcr & FPCR_STATUS_MASK; + fpcr |= soft_fpcr & (FPCR_STATUS_MASK | FPCR_DNZ); #endif t |= CONVERT_BIT(fpcr, FPCR_INED, FPCR_INE); @@ -73,9 +73,6 @@ void cpu_alpha_store_fpcr(CPUAlphaState *env, uint64_t val) env->fpcr_flush_to_zero = (fpcr & FPCR_UNFD) && (fpcr & FPCR_UNDZ); env->fp_status.flush_inputs_to_zero = (fpcr & FPCR_DNZ) != 0; #ifdef CONFIG_USER_ONLY - if (env->swcr & SWCR_MAP_DMZ) { - env->fp_status.flush_inputs_to_zero = 1; - } if (env->swcr & SWCR_MAP_UMZ) { env->fpcr_flush_to_zero = 1; } -- 2.11.0