d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mark static inline functions with __fenv_static.

Browse Source 
* Correctly shift the mask when masking/unmasking exceptions.
This commit is contained in:
Andrew Turner 2014-01-25 18:13:43 +00:00
parent 43349674f1
commit a541d15cfe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=261163
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/msun/arm/fenv.h
View File

@ -98,6 +98,8 @@ int feupdateenv(const fenv_t *__envp);
#define vmrs_fpscr(__r) __asm __volatile("vmrs %0, fpscr" : "=&r"(__r))
#define vmsr_fpscr(__r) __asm __volatile("vmsr fpscr, %0" : : "r"(__r))
#define _FPU_MASK_SHIFT 8
__fenv_static inline int
feclearexcept(int __excepts)
{
@ -213,29 +215,31 @@ feupdateenv(const fenv_t *__envp)
/* We currently provide no external definitions of the functions below. */
static inline int
__fenv_static inline int
feenableexcept(int __mask)
{
fenv_t __old_fpsr, __new_fpsr;
vmrs_fpscr(__old_fpsr);
__new_fpsr = __old_fpsr | (__mask & FE_ALL_EXCEPT);
__new_fpsr = __old_fpsr |
((__mask & FE_ALL_EXCEPT) << _FPU_MASK_SHIFT);
vmsr_fpscr(__new_fpsr);
return (__old_fpsr & FE_ALL_EXCEPT);
return ((__old_fpsr >> _FPU_MASK_SHIFT) & FE_ALL_EXCEPT);
}
static inline int
__fenv_static inline int
fedisableexcept(int __mask)
{
fenv_t __old_fpsr, __new_fpsr;
vmrs_fpscr(__old_fpsr);
__new_fpsr = __old_fpsr & ~(__mask & FE_ALL_EXCEPT);
__new_fpsr = __old_fpsr &
~((__mask & FE_ALL_EXCEPT) << _FPU_MASK_SHIFT);
vmsr_fpscr(__new_fpsr);
return (__old_fpsr & FE_ALL_EXCEPT);
return ((__old_fpsr >> _FPU_MASK_SHIFT) & FE_ALL_EXCEPT);
}
static inline int
__fenv_static inline int
fegetexcept(void)
{
fenv_t __fpsr;