aboutsummaryrefslogtreecommitdiff
path: root/target/alpha
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2019-09-20 21:32:56 -0700
committerAlex Bennée <alex.bennee@linaro.org>2019-09-26 19:00:53 +0100
commit11bfdbdfc2863502967ea32f0576058e790a5149 (patch)
tree91ddfef6ff6f7fe63d4f45871f79f9add263701b /target/alpha
parent8009307031affdd0311750d9b5684f6d5a908ab9 (diff)
target/alpha: Tidy helper_fp_exc_raise_s
Remove a redundant masking of ignore. Once that's gone it is obvious that the system-mode inner test is redundant with the outer test. Move the fpcr_exc_enable masking up and tidy. No functional change. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190921043256.4575-8-richard.henderson@linaro.org>
Diffstat (limited to 'target/alpha')
-rw-r--r--target/alpha/fpu_helper.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/target/alpha/fpu_helper.c b/target/alpha/fpu_helper.c
index 62a066d902..df8b58963b 100644
--- a/target/alpha/fpu_helper.c
+++ b/target/alpha/fpu_helper.c
@@ -90,25 +90,18 @@ void helper_fp_exc_raise_s(CPUAlphaState *env, uint32_t ignore, uint32_t regno)
uint32_t exc = env->error_code & ~ignore;
if (exc) {
env->fpcr |= exc;
- exc &= ~ignore;
-#ifdef CONFIG_USER_ONLY
- /*
- * In user mode, the kernel's software handler only
- * delivers a signal if the exception is enabled.
- */
- if (!(exc & env->fpcr_exc_enable)) {
- return;
- }
-#else
+ exc &= env->fpcr_exc_enable;
/*
* In system mode, the software handler gets invoked
* for any non-ignored exception.
+ * In user mode, the kernel's software handler only
+ * delivers a signal if the exception is enabled.
*/
+#ifdef CONFIG_USER_ONLY
if (!exc) {
return;
}
#endif
- exc &= env->fpcr_exc_enable;
fp_exc_raise1(env, GETPC(), exc, regno, EXC_M_SWC);
}
}