From 6b3dc26c7673476400596dd8687fef8bfc2e43e2 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Fri, 18 Jul 2008 13:21:45 +0000 Subject: [PATCH] 2008-07-18 Joseph Myers * sysdeps/arm/eabi/fgetexcptflg.c: New. * sysdeps/arm/eabi/fsetexcptflg.c (__fesetexceptflag): Operate on set exception flags, not on mask of enabled exceptions. --- ChangeLog.arm | 6 +++++ sysdeps/arm/eabi/fgetexcptflg.c | 54 +++++++++++++++++++++++++++++++++++++++++ sysdeps/arm/eabi/fsetexcptflg.c | 6 ++--- 3 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 sysdeps/arm/eabi/fgetexcptflg.c diff --git a/ChangeLog.arm b/ChangeLog.arm index 867bec4..5cca360 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,5 +1,11 @@ 2008-07-18 Joseph Myers + * sysdeps/arm/eabi/fgetexcptflg.c: New. + * sysdeps/arm/eabi/fsetexcptflg.c (__fesetexceptflag): Operate on + set exception flags, not on mask of enabled exceptions. + +2008-07-18 Joseph Myers + * sysdeps/arm/eabi/feupdateenv.c: New. 2008-07-18 Joseph Myers diff --git a/sysdeps/arm/eabi/fgetexcptflg.c b/sysdeps/arm/eabi/fgetexcptflg.c new file mode 100644 index 0000000..2259fa3 --- /dev/null +++ b/sysdeps/arm/eabi/fgetexcptflg.c @@ -0,0 +1,54 @@ +/* Store current representation for exceptions. + Copyright (C) 1997, 1999, 2000, 2008 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +#include +#include +#include +#include + +int +__fegetexceptflag (fexcept_t *flagp, int excepts) +{ + if (GLRO (dl_hwcap) & HWCAP_ARM_VFP) + { + unsigned long temp; + + /* Get the current exceptions. */ + _FPU_GETCW (temp); + + *flagp = temp & excepts & FE_ALL_EXCEPT; + + /* Success. */ + return 0; + } + + /* Unsupported, so fail. */ + return 1; +} + +#include +#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) +strong_alias (__fegetexceptflag, __old_fegetexceptflag) +compat_symbol (libm, __old_fegetexceptflag, fegetexceptflag, GLIBC_2_1); +#endif +versioned_symbol (libm, __fegetexceptflag, fegetexceptflag, GLIBC_2_2); diff --git a/sysdeps/arm/eabi/fsetexcptflg.c b/sysdeps/arm/eabi/fsetexcptflg.c index 2e05514..3dfeb2c 100644 --- a/sysdeps/arm/eabi/fsetexcptflg.c +++ b/sysdeps/arm/eabi/fsetexcptflg.c @@ -1,5 +1,5 @@ /* Set floating-point environment exception handling. - Copyright (C) 1997,98,99,2000,01,05 Free Software Foundation, Inc. + Copyright (C) 1997,98,99,2000,01,05,08 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,8 +37,8 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts) _FPU_GETCW (temp); /* Set the desired exception mask. */ - temp &= ~((excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT); - temp |= (*flagp & excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT; + temp &= ~(excepts & FE_ALL_EXCEPT); + temp |= (*flagp & excepts & FE_ALL_EXCEPT); /* Save state back to the FPU. */ _FPU_SETCW (temp); -- 2.7.4