diff options
| author | Wilco <wdijkstr@arm.com> | 2014-05-15 15:18:40 +0100 |
|---|---|---|
| committer | Marcus Shawcroft <marcus.shawcroft@arm.com> | 2014-05-15 15:23:27 +0100 |
| commit | 1a2f40e5d14ed6450696feacf04fca5eeceae7ef (patch) | |
| tree | f08d34c9426d8833b6daef1509a1ac431e0b3c0b /sysdeps/arm/fedisblxcpt.c | |
| parent | cf26a0cb6a0bbaca46a01ddad6662e5e5159a32a (diff) | |
| download | glibc-1a2f40e5d14ed6450696feacf04fca5eeceae7ef.tar.gz glibc-1a2f40e5d14ed6450696feacf04fca5eeceae7ef.tar.xz glibc-1a2f40e5d14ed6450696feacf04fca5eeceae7ef.zip | |
ARM: Improve fenv implementation
Diffstat (limited to 'sysdeps/arm/fedisblxcpt.c')
| -rw-r--r-- | sysdeps/arm/fedisblxcpt.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/sysdeps/arm/fedisblxcpt.c b/sysdeps/arm/fedisblxcpt.c index 88da539439..f2956cd32a 100644 --- a/sysdeps/arm/fedisblxcpt.c +++ b/sysdeps/arm/fedisblxcpt.c @@ -25,23 +25,17 @@ int fedisableexcept (int excepts) { - if (ARM_HAVE_VFP) - { - unsigned long int new_exc, old_exc; + fpu_control_t fpscr, new_fpscr; - _FPU_GETCW(new_exc); + /* Fail if a VFP unit isn't present. */ + if (!ARM_HAVE_VFP) + return -1; - old_exc = (new_exc >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT; + _FPU_GETCW (fpscr); + excepts &= FE_ALL_EXCEPT; + new_fpscr = fpscr & ~(excepts << FE_EXCEPT_SHIFT); - excepts &= FE_ALL_EXCEPT; + _FPU_SETCW (new_fpscr); - new_exc &= ~(excepts << FE_EXCEPT_SHIFT); - - _FPU_SETCW(new_exc); - - return old_exc; - } - - /* Unsupported, so return -1 for failure. */ - return -1; + return (fpscr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT; } |