[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] target/alpha: Tidy helper_fp_exc_raise_s
From: |
Richard Henderson |
Subject: |
[PATCH 7/7] target/alpha: Tidy helper_fp_exc_raise_s |
Date: |
Fri, 20 Sep 2019 21:32:56 -0700 |
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 <address@hidden>
---
target/alpha/fpu_helper.c | 15 ++++-----------
1 file 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);
}
}
--
2.17.1
- [PATCH 0/7] target/alpha: Fix linux-user exception for CVTTQ, Richard Henderson, 2019/09/21
- [PATCH 1/7] target/alpha: Use array for FPCR_DYN conversion, Richard Henderson, 2019/09/21
- [PATCH 2/7] target/alpha: Fix SWCR_MAP_UMZ, Richard Henderson, 2019/09/21
- [PATCH 5/7] target/alpha: Write to fpcr_flush_to_zero once, Richard Henderson, 2019/09/21
- [PATCH 3/7] target/alpha: Fix SWCR_TRAP_ENABLE_MASK, Richard Henderson, 2019/09/21
- [PATCH 7/7] target/alpha: Tidy helper_fp_exc_raise_s,
Richard Henderson <=
- [PATCH 6/7] target/alpha: Mask IOV exception with INV for user-only, Richard Henderson, 2019/09/21
- [PATCH 4/7] target/alpha: Handle SWCR_MAP_DMZ earlier, Richard Henderson, 2019/09/21
- Re: [PATCH 0/7] target/alpha: Fix linux-user exception for CVTTQ, Alex Bennée, 2019/09/23