mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 10:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "ARM: Improve fenv implementation"

Browse Source 
This reverts commit c0c08d02c8.
This commit is contained in:
Marcus Shawcroft 2014-05-19 09:08:59 +01:00
parent 834caf06f3
commit 18f8524d2c
13 changed files with 101 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1011,24 +1011,6 @@
* nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
(pthread_mutex_t): Add lock elision support for s390.
2014-05-14 Wilco <wdijkstr@arm.com>
* sysdeps/arm/fclrexcpt.c: Optimize to avoid unnecessary FPSCR writes.
* sysdeps/arm/fedisblxcpt.c: Likewise.
* sysdeps/arm/feenablxcpt.c: Likewise.
* sysdeps/arm/fegetround.c: Call (get_rounding_mode).
* sysdeps/arm/feholdexcpt.c: Call optimized (libc_feholdexcept_vfp).
* sysdeps/arm/fesetenv.c: Special case FE_DFL_ENV and FE_NOMASK_ENV.
Call optimized (libc_fesetenv_vfp).
* sysdeps/arm/fesetround.c: Call optimized (libc_fesetround_vfp).
* sysdeps/arm/feupdateenv.c: Special case FE_DFL_ENV and FE_NOMASK_ENV.
Call optimized (libc_feupdateenv_vfp).
* sysdeps/arm/fgetexcptflg.c: Call optimized (libc_fetestexcept_vfp).
* sysdeps/arm/fsetexcptflg.c: Optimize to avoid unnecessary FPSCR
writes.
* sysdeps/arm/ftestexcept.c: Call optimized (libc_fetestexcept_vfp).
* sysdeps/arm/setfpucw.c: Optimize to avoid unnecessary FPSCR writes.
2014-05-14 Wilco <wdijkstr@arm.com>
* sysdeps/arm/fclrexcpt.c: Cleanup.

10
sysdeps/arm/fclrexcpt.c
View File

@ -24,7 +24,7 @@
int
feclearexcept (int excepts)
{
fpu_control_t fpscr, new_fpscr;
fpu_control_t fpscr;
/* Fail if a VFP unit isn't present unless nothing needs to be done. */
if (!ARM_HAVE_VFP)
@ -32,11 +32,11 @@ feclearexcept (int excepts)
_FPU_GETCW (fpscr);
excepts &= FE_ALL_EXCEPT;
new_fpscr = fpscr & ~excepts;
/* Write new exception flags if changed. */
if (new_fpscr != fpscr)
_FPU_SETCW (new_fpscr);
/* Clear the relevant bits. */
fpscr = (fpscr & ~FE_ALL_EXCEPT) | (fpscr & FE_ALL_EXCEPT & ~excepts);
_FPU_SETCW (fpscr);
return 0;
}

4
sysdeps/arm/fedisblxcpt.c
View File

@ -35,9 +35,7 @@ fedisableexcept (int excepts)
excepts &= FE_ALL_EXCEPT;
new_fpscr = fpscr & ~(excepts << FE_EXCEPT_SHIFT);
/* Write new exceptions if changed. */
if (new_fpscr != fpscr)
_FPU_SETCW (new_fpscr);
_FPU_SETCW (new_fpscr);
return (fpscr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
}

10
sysdeps/arm/feenablxcpt.c
View File

@ -35,15 +35,15 @@ feenableexcept (int excepts)
excepts &= FE_ALL_EXCEPT;
new_fpscr = fpscr | (excepts << FE_EXCEPT_SHIFT);
if (new_fpscr != fpscr)
{
_FPU_SETCW (new_fpscr);
_FPU_SETCW (new_fpscr);
if (excepts != 0)
{
/* Not all VFP architectures support trapping exceptions, so
test whether the relevant bits were set and fail if not. */
_FPU_GETCW (new_fpscr);
if (((new_fpscr >> FE_EXCEPT_SHIFT) & excepts) != excepts)
if ((new_fpscr & (excepts << FE_EXCEPT_SHIFT))
!= (excepts << FE_EXCEPT_SHIFT))
return -1;
}

14
sysdeps/arm/fegetround.c
View File

@ -16,12 +16,22 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <get-rounding-mode.h>
#include <fenv.h>
#include <fpu_control.h>
#include <arm-features.h>
int
fegetround (void)
{
return get_rounding_mode ();
fpu_control_t fpscr;
/* FE_TONEAREST is the only supported rounding mode
if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return FE_TONEAREST;
_FPU_GETCW (fpscr);
return fpscr & FE_TOWARDZERO;
}
libm_hidden_def (fegetround)

16
sysdeps/arm/feholdexcpt.c
View File

@ -16,18 +16,30 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <fenv_private.h>
#include <fenv.h>
#include <fpu_control.h>
#include <arm-features.h>
int
feholdexcept (fenv_t *envp)
{
fpu_control_t fpscr;
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
libc_feholdexcept_vfp (envp);
_FPU_GETCW (fpscr);
envp->__cw = fpscr;
/* Now set all exceptions to non-stop. */
fpscr &= ~(FE_ALL_EXCEPT << FE_EXCEPT_SHIFT);
/* And clear all exception flags. */
fpscr &= ~FE_ALL_EXCEPT;
_FPU_SETCW (fpscr);
return 0;
}

46
sysdeps/arm/fesetenv.c
View File

@ -16,43 +16,43 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <fenv_private.h>
#include <fenv.h>
#include <fpu_control.h>
#include <arm-features.h>
int
fesetenv (const fenv_t *envp)
{
fpu_control_t fpscr;
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
if ((envp == FE_DFL_ENV) || (envp == FE_NOMASK_ENV))
_FPU_GETCW (fpscr);
/* Preserve the reserved FPSCR flags. */
fpscr &= _FPU_RESERVED;
if (envp == FE_DFL_ENV)
fpscr |= _FPU_DEFAULT;
else if (envp == FE_NOMASK_ENV)
fpscr |= _FPU_IEEE;
else
fpscr |= envp->__cw & ~_FPU_RESERVED;
_FPU_SETCW (fpscr);
if (envp == FE_NOMASK_ENV)
{
fpu_control_t fpscr, new_fpscr;
/* Not all VFP architectures support trapping exceptions, so
test whether the relevant bits were set and fail if not. */
_FPU_GETCW (fpscr);
/* Preserve the reserved FPSCR flags. */
new_fpscr = fpscr & _FPU_RESERVED;
if (envp == FE_DFL_ENV)
_FPU_SETCW (new_fpscr | _FPU_DEFAULT);
else
{
_FPU_SETCW (new_fpscr | _FPU_IEEE);
/* Not all VFP architectures support trapping exceptions, so
test whether the relevant bits were set and fail if not. */
_FPU_GETCW (fpscr);
if ((fpscr & _FPU_IEEE) != _FPU_IEEE)
return 1;
}
return 0;
if ((fpscr & _FPU_IEEE) != _FPU_IEEE)
return 1;
}
libc_fesetenv_vfp (envp);
return 0;
}

10
sysdeps/arm/fesetround.c
View File

@ -16,22 +16,28 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <fenv_private.h>
#include <fenv.h>
#include <fpu_control.h>
#include <arm-features.h>
int
fesetround (int round)
{
fpu_control_t fpscr;
/* FE_TONEAREST is the only supported rounding mode
if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return (round == FE_TONEAREST) ? 0 : 1;
/* Fail if the rounding mode is not valid. */
if (round & ~FE_TOWARDZERO)
return 1;
libc_fesetround_vfp (round);
_FPU_GETCW (fpscr);
fpscr = (fpscr & ~FE_TOWARDZERO) | round;
_FPU_SETCW (fpscr);
return 0;
}

24
sysdeps/arm/feupdateenv.c
View File

@ -17,35 +17,27 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <fenv_private.h>
#include <fenv.h>
#include <fpu_control.h>
#include <arm-features.h>
int
feupdateenv (const fenv_t *envp)
{
fenv_t fenv;
fpu_control_t fpscr;
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
if ((envp == FE_DFL_ENV) || (envp == FE_NOMASK_ENV))
{
fpu_control_t fpscr;
_FPU_GETCW (fpscr);
_FPU_GETCW (fpscr);
/* Install new environment. */
fesetenv (envp);
/* Preserve the reserved FPSCR flags. */
fpscr &= _FPU_RESERVED;
fpscr |= (envp == FE_DFL_ENV) ? _FPU_DEFAULT : _FPU_IEEE;
/* Create a valid fenv to pass to libc_feupdateenv_vfp. */
fenv.__cw = fpscr;
envp = &fenv;
}
libc_feupdateenv_vfp (envp);
/* Raise the saved exceptions. */
feraiseexcept (fpscr & FE_ALL_EXCEPT);
return 0;
}
libm_hidden_def (feupdateenv)

9
sysdeps/arm/fgetexcptflg.c
View File

@ -17,17 +17,22 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <fenv_private.h>
#include <fenv.h>
#include <fpu_control.h>
#include <arm-features.h>
int
fegetexceptflag (fexcept_t *flagp, int excepts)
{
fpu_control_t fpscr;
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
*flagp = libc_fetestexcept_vfp (excepts);
_FPU_GETCW (fpscr);
*flagp = fpscr & excepts & FE_ALL_EXCEPT;
return 0;
}

13
sysdeps/arm/fsetexcptflg.c
View File

@ -25,22 +25,19 @@
int
fesetexceptflag (const fexcept_t *flagp, int excepts)
{
fpu_control_t fpscr, new_fpscr;
fpu_control_t fpscr;
/* Fail if a VFP unit isn't present unless nothing needs to be done. */
if (!ARM_HAVE_VFP)
return (excepts != 0);
_FPU_GETCW (fpscr);
excepts &= FE_ALL_EXCEPT;
/* Set the desired exception mask. */
new_fpscr = fpscr & ~excepts;
new_fpscr |= *flagp & excepts;
/* Write new exception flags if changed. */
if (new_fpscr != fpscr)
_FPU_SETCW (new_fpscr);
fpscr &= ~(excepts & FE_ALL_EXCEPT);
fpscr |= (*flagp & excepts & FE_ALL_EXCEPT);
/* Save state back to the FPU. */
_FPU_SETCW (fpscr);
return 0;
}

11
sysdeps/arm/ftestexcept.c
View File

@ -16,18 +16,23 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <fenv_private.h>
#include <fenv.h>
#include <fpu_control.h>
#include <arm-features.h>
int
fetestexcept (int excepts)
{
fpu_control_t fpscr;
/* Return no exception flags if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 0;
return libc_fetestexcept_vfp (excepts);
}
/* Get current exceptions. */
_FPU_GETCW (fpscr);
return fpscr & excepts & FE_ALL_EXCEPT;
}
libm_hidden_def (fetestexcept)

11
sysdeps/arm/setfpucw.c
View File

@ -24,20 +24,19 @@
void
__setfpucw (fpu_control_t set)
{
fpu_control_t fpscr, new_fpscr;
fpu_control_t fpscr;
/* Do nothing if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return;
/* Fetch the current control word. */
_FPU_GETCW (fpscr);
/* Preserve the reserved bits, and set the rest as the user
specified (or the default, if the user gave zero). */
new_fpscr = fpscr & _FPU_RESERVED;
new_fpscr |= set & ~_FPU_RESERVED;
fpscr &= _FPU_RESERVED;
fpscr |= set & ~_FPU_RESERVED;
/* Write FPSCR if changed. */
if (new_fpscr != fpscr)
_FPU_SETCW (fpscr);
_FPU_SETCW (fpscr);
}