mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-28 12:13:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: Improve fenv implementation

Browse Source
This commit is contained in:
Wilco 2014-05-15 15:18:40 +01:00 committed by Marcus Shawcroft
parent cf26a0cb6a
commit 1a2f40e5d1
17 changed files with 190 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -895,6 +895,25 @@
* 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: Cleanup.
* sysdeps/arm/fedisblxcpt.c: Cleanup.
* sysdeps/arm/feenablxcpt.c: Cleanup.
* sysdeps/arm/fegetenv.c: Cleanup.
* sysdeps/arm/fegetexcept.c: Cleanup.
* sysdeps/arm/fegetround.c: Cleanup.
* sysdeps/arm/feholdexcpt.c: Cleanup.
* sysdeps/arm/fesetenv.c: Cleanup.
* sysdeps/arm/fesetround.c: Cleanup.
* sysdeps/arm/feupdateenv.c: Cleanup.
* sysdeps/arm/fgetexcptflg.c: Cleanup.
* sysdeps/arm/fraiseexcpt.c: Cleanup.
* sysdeps/arm/fsetexcptflg.c: Cleanup.
* sysdeps/arm/ftestexcept.c: Cleanup.
* sysdeps/arm/get-rounding-mode.h: Cleanup.
* sysdeps/arm/setfpucw.c: Cleanup.
2014-05-09 Will Newton <will.newton@linaro.org>
* sysdeps/arm/armv7/strcmp.S: New file.

23
sysdeps/arm/fclrexcpt.c
View File

@ -24,27 +24,20 @@
int
feclearexcept (int excepts)
{
if (ARM_HAVE_VFP)
{
unsigned long int temp;
fpu_control_t fpscr;
/* Mask out unsupported bits/exceptions. */
/* 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;
/* Get the current floating point status. */
_FPU_GETCW (temp);
/* Clear the relevant bits. */
temp = (temp & ~FE_ALL_EXCEPT) | (temp & FE_ALL_EXCEPT & ~excepts);
fpscr = (fpscr & ~FE_ALL_EXCEPT) | (fpscr & FE_ALL_EXCEPT & ~excepts);
/* Put the new data in effect. */
_FPU_SETCW (temp);
_FPU_SETCW (fpscr);
/* Success. */
return 0;
}
/* Unsupported, so fail unless nothing needs to be done. */
return (excepts != 0);
}
libm_hidden_def (feclearexcept)

28
sysdeps/arm/fedisblxcpt.c
View File

@ -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);
old_exc = (new_exc >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
excepts &= FE_ALL_EXCEPT;
new_exc &= ~(excepts << FE_EXCEPT_SHIFT);
_FPU_SETCW(new_exc);
return old_exc;
}
/* Unsupported, so return -1 for failure. */
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return -1;
_FPU_GETCW (fpscr);
excepts &= FE_ALL_EXCEPT;
new_fpscr = fpscr & ~(excepts << FE_EXCEPT_SHIFT);
_FPU_SETCW (new_fpscr);
return (fpscr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
}

32
sysdeps/arm/feenablxcpt.c
View File

@ -25,35 +25,27 @@
int
feenableexcept (int excepts)
{
if (ARM_HAVE_VFP)
{
unsigned long int new_exc, old_exc;
fpu_control_t fpscr, new_fpscr;
_FPU_GETCW(new_exc);
old_exc = (new_exc >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return -1;
_FPU_GETCW (fpscr);
excepts &= FE_ALL_EXCEPT;
new_fpscr = fpscr | (excepts << FE_EXCEPT_SHIFT);
new_exc |= (excepts << FE_EXCEPT_SHIFT);
_FPU_SETCW(new_exc);
_FPU_SETCW (new_fpscr);
if (excepts != 0)
{
/* VFPv3 and VFPv4 do not support trapping exceptions, so
test whether the relevant bits were set and fail if
not. */
unsigned int temp;
_FPU_GETCW (temp);
if ((temp & (excepts << FE_EXCEPT_SHIFT))
/* 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 & (excepts << FE_EXCEPT_SHIFT))
!= (excepts << FE_EXCEPT_SHIFT))
return -1;
}
return old_exc;
}
/* Unsupported, so return -1 for failure. */
return -1;
return (fpscr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
}

17
sysdeps/arm/fegetenv.c
View File

@ -24,17 +24,14 @@
int
fegetenv (fenv_t *envp)
{
if (ARM_HAVE_VFP)
{
unsigned long int temp;
_FPU_GETCW (temp);
envp->__cw = temp;
fpu_control_t fpscr;
/* Success. */
return 0;
}
/* Unsupported, so fail. */
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
_FPU_GETCW (fpscr);
envp->__cw = fpscr;
return 0;
}
libm_hidden_def (fegetenv)

16
sysdeps/arm/fegetexcept.c
View File

@ -25,15 +25,13 @@
int
fegetexcept (void)
{
if (ARM_HAVE_VFP)
{
unsigned long temp;
fpu_control_t fpscr;
_FPU_GETCW (temp);
return (temp >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
}
/* Unsupported. Return all exceptions disabled. */
/* Return with all exceptions disabled if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 0;
_FPU_GETCW (fpscr);
return (fpscr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
}

17
sysdeps/arm/fegetround.c
View File

@ -24,17 +24,14 @@
int
fegetround (void)
{
if (ARM_HAVE_VFP)
{
unsigned int temp;
fpu_control_t fpscr;
/* Get the current environment. */
_FPU_GETCW (temp);
return temp & FE_TOWARDZERO;
}
/* The current soft-float implementation only handles TONEAREST. */
/* 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)

24
sysdeps/arm/feholdexcpt.c
View File

@ -24,27 +24,23 @@
int
feholdexcept (fenv_t *envp)
{
if (ARM_HAVE_VFP)
{
unsigned long int temp;
fpu_control_t fpscr;
/* Store the environment. */
_FPU_GETCW(temp);
envp->__cw = temp;
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
_FPU_GETCW (fpscr);
envp->__cw = fpscr;
/* Now set all exceptions to non-stop. */
temp &= ~(FE_ALL_EXCEPT << FE_EXCEPT_SHIFT);
fpscr &= ~(FE_ALL_EXCEPT << FE_EXCEPT_SHIFT);
/* And clear all exception flags. */
temp &= ~FE_ALL_EXCEPT;
_FPU_SETCW(temp);
fpscr &= ~FE_ALL_EXCEPT;
_FPU_SETCW (fpscr);
return 0;
}
/* Unsupported, so fail. */
return 1;
}
libm_hidden_def (feholdexcept)

36
sysdeps/arm/fesetenv.c
View File

@ -24,38 +24,36 @@
int
fesetenv (const fenv_t *envp)
{
if (ARM_HAVE_VFP)
{
unsigned int temp;
fpu_control_t fpscr;
_FPU_GETCW (temp);
temp &= _FPU_RESERVED;
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
_FPU_GETCW (fpscr);
/* Preserve the reserved FPSCR flags. */
fpscr &= _FPU_RESERVED;
if (envp == FE_DFL_ENV)
temp |= _FPU_DEFAULT;
fpscr |= _FPU_DEFAULT;
else if (envp == FE_NOMASK_ENV)
temp |= _FPU_IEEE;
fpscr |= _FPU_IEEE;
else
temp |= envp->__cw & ~_FPU_RESERVED;
fpscr |= envp->__cw & ~_FPU_RESERVED;
_FPU_SETCW (temp);
_FPU_SETCW (fpscr);
if (envp == FE_NOMASK_ENV)
{
/* VFPv3 and VFPv4 do not support trapping exceptions, so
test whether the relevant bits were set and fail if
not. */
_FPU_GETCW (temp);
if ((temp & _FPU_IEEE) != _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;
}
/* Success. */
return 0;
}
/* Unsupported, so fail. */
return 1;
}
libm_hidden_def (fesetenv)

33
sysdeps/arm/fesetround.c
View File

@ -24,30 +24,21 @@
int
fesetround (int round)
{
if (ARM_HAVE_VFP)
{
fpu_control_t temp;
fpu_control_t fpscr;
switch (round)
{
case FE_TONEAREST:
case FE_UPWARD:
case FE_DOWNWARD:
case FE_TOWARDZERO:
_FPU_GETCW (temp);
temp = (temp & ~FE_TOWARDZERO) | round;
_FPU_SETCW (temp);
return 0;
default:
return 1;
}
}
else if (round == FE_TONEAREST)
/* This is the only supported rounding mode for soft-fp. */
return 0;
/* 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;
/* Unsupported, so fail. */
/* Fail if the rounding mode is not valid. */
if (round & ~FE_TOWARDZERO)
return 1;
_FPU_GETCW (fpscr);
fpscr = (fpscr & ~FE_TOWARDZERO) | round;
_FPU_SETCW (fpscr);
return 0;
}
libm_hidden_def (fesetround)

19
sysdeps/arm/feupdateenv.c
View File

@ -25,24 +25,19 @@
int
feupdateenv (const fenv_t *envp)
{
if (ARM_HAVE_VFP)
{
unsigned int temp;
fpu_control_t fpscr;
/* Get the current exception state. */
_FPU_GETCW (temp);
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
_FPU_GETCW (fpscr);
/* Install new environment. */
fesetenv (envp);
/* Raise the saved exceptions. */
feraiseexcept (temp & FE_ALL_EXCEPT);
/* Success. */
feraiseexcept (fpscr & FE_ALL_EXCEPT);
return 0;
}
/* Unsupported, so fail. */
return 1;
}
libm_hidden_def (feupdateenv)

21
sysdeps/arm/fgetexcptflg.c
View File

@ -25,19 +25,14 @@
int
fegetexceptflag (fexcept_t *flagp, int excepts)
{
if (ARM_HAVE_VFP)
{
unsigned long temp;
fpu_control_t fpscr;
/* Get the current exceptions. */
_FPU_GETCW (temp);
*flagp = temp & excepts & FE_ALL_EXCEPT;
/* Success. */
return 0;
}
/* Unsupported, so fail. */
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 1;
_FPU_GETCW (fpscr);
*flagp = fpscr & excepts & FE_ALL_EXCEPT;
return 0;
}

10
sysdeps/arm/fraiseexcpt.c
View File

@ -25,9 +25,12 @@
int
feraiseexcept (int excepts)
{
if (ARM_HAVE_VFP)
/* Fail if a VFP unit isn't present unless nothing needs to be done. */
if (!ARM_HAVE_VFP)
return (excepts != 0);
else
{
int fpscr;
fpu_control_t fpscr;
const float fp_zero = 0.0, fp_one = 1.0, fp_max = FLT_MAX,
fp_min = FLT_MIN, fp_1e32 = 1.0e32f, fp_two = 2.0,
fp_three = 3.0;
@ -98,9 +101,6 @@ feraiseexcept (int excepts)
/* Success. */
return 0;
}
/* Unsupported, so fail unless nothing needs to be done. */
return (excepts != 0);
}
libm_hidden_def (feraiseexcept)

23
sysdeps/arm/fsetexcptflg.c
View File

@ -25,24 +25,19 @@
int
fesetexceptflag (const fexcept_t *flagp, int excepts)
{
if (ARM_HAVE_VFP)
{
fexcept_t temp;
fpu_control_t fpscr;
/* Get the current environment. */
_FPU_GETCW (temp);
/* Fail if a VFP unit isn't present unless nothing needs to be done. */
if (!ARM_HAVE_VFP)
return (excepts != 0);
_FPU_GETCW (fpscr);
/* Set the desired exception mask. */
temp &= ~(excepts & FE_ALL_EXCEPT);
temp |= (*flagp & excepts & FE_ALL_EXCEPT);
fpscr &= ~(excepts & FE_ALL_EXCEPT);
fpscr |= (*flagp & excepts & FE_ALL_EXCEPT);
/* Save state back to the FPU. */
_FPU_SETCW (temp);
/* Success. */
_FPU_SETCW (fpscr);
return 0;
}
/* Unsupported, so fail unless nothing needs to be done. */
return (excepts != 0);
}

16
sysdeps/arm/ftestexcept.c
View File

@ -24,17 +24,15 @@
int
fetestexcept (int excepts)
{
if (ARM_HAVE_VFP)
{
fexcept_t temp;
fpu_control_t fpscr;
/* Return no exception flags if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
return 0;
/* Get current exceptions. */
_FPU_GETCW(temp);
_FPU_GETCW (fpscr);
return temp & excepts & FE_ALL_EXCEPT;
}
/* Unsupported, return 0. */
return 0;
return fpscr & excepts & FE_ALL_EXCEPT;
}
libm_hidden_def (fetestexcept)

14
sysdeps/arm/get-rounding-mode.h
View File

@ -28,15 +28,15 @@
static inline int
get_rounding_mode (void)
{
if (ARM_HAVE_VFP)
{
fpu_control_t fc;
fpu_control_t fpscr;
_FPU_GETCW (fc);
return fc & FE_TOWARDZERO;
}
else
/* 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;
}
#endif /* get-rounding-mode.h */

19
sysdeps/arm/setfpucw.c
View File

@ -24,20 +24,19 @@
void
__setfpucw (fpu_control_t set)
{
if (ARM_HAVE_VFP)
{
fpu_control_t cw;
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 (cw);
_FPU_GETCW (fpscr);
/* Preserve the reserved bits, and set the rest as the user
specified (or the default, if the user gave zero). */
cw &= _FPU_RESERVED;
cw |= set & ~_FPU_RESERVED;
fpscr &= _FPU_RESERVED;
fpscr |= set & ~_FPU_RESERVED;
_FPU_SETCW (cw);
}
/* Do nothing if a VFP unit isn't present. */
_FPU_SETCW (fpscr);
}