Update.

1999-11-02  Andreas Jaeger  <aj@suse.de>

	* Versions.def: Add version GLIBC_2.2 for libm.
	* math/fenv.h: Add prototypes for fegetexcept, feenableexcept and
	fedisableexcept.
	* sysdeps/generic/feenablxcpt.c: Stub file.
	* sysdeps/generic/fedisblxcpt.c: Stub file.
	* sysdeps/generic/fegetexcept.c: Stub file.
	* sysdeps/i386/fpu/fedisblxcpt.c: New file.
	* sysdeps/i386/fpu/feenablxcpt.c: New file.
	* sysdeps/i386/fpu/fegetexcept.c: New file.
	* math/Makefile (libm-support): Add new files.
	* math/Versions: Add new functions with version GLIBC_2.2.
	* manual/arith.texi (Control Functions): Document fegetexcept,
	feenableexcept and fedisableexcept.

12 files changed, 274 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 753183cb59..001d37e8ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1999-11-02  Andreas Jaeger  <aj@suse.de>
+
+	* Versions.def: Add version GLIBC_2.2 for libm.
+	* math/fenv.h: Add prototypes for fegetexcept, feenableexcept and
+	fedisableexcept.
+	* sysdeps/generic/feenablxcpt.c: Stub file.
+	* sysdeps/generic/fedisblxcpt.c: Stub file.
+	* sysdeps/generic/fegetexcept.c: Stub file.
+	* sysdeps/i386/fpu/fedisblxcpt.c: New file.
+	* sysdeps/i386/fpu/feenablxcpt.c: New file.
+	* sysdeps/i386/fpu/fegetexcept.c: New file.
+	* math/Makefile (libm-support): Add new files.
+	* math/Versions: Add new functions with version GLIBC_2.2.
+	* manual/arith.texi (Control Functions): Document fegetexcept,
+	feenableexcept and fedisableexcept.
+
 1999-11-01  Wolfram Gloger  <wg@malloc.de>
 
 	* malloc/malloc.h: Describe __malloc_initialize_hook.
diff --git a/Versions.def b/Versions.def
index 82b0f1db01..480eef8e82 100644
--- a/Versions.def
+++ b/Versions.def
@@ -26,6 +26,7 @@ libm {
   GLIBC_2.0
   GLIBC_2.1 GLIBC_2.0
   GLIBC_2.1.3 GLIBC_2.1
+  GLIBC_2.2 GLIBC_2.1.3
 }
 libmachuser {
   GLIBC_2.0
diff --git a/manual/arith.texi b/manual/arith.texi
index 51d67a99d1..a7d6944b1f 100644
--- a/manual/arith.texi
+++ b/manual/arith.texi
@@ -828,6 +828,42 @@ The function returns zero in case the operation was successful, a
 non-zero value otherwise.
 @end deftypefun
 
+@noindent
+To control for individual exceptions if raising them causes a trap to
+occur, you can use the following two functions.
+
+@strong{Portability Note:} These functions are all GNU extensions.
+
+@comment fenv.h
+@comment GNU
+@deftypefun int feenableexcept (int @var{excepts})
+This functions enables traps for each of the exceptions as indicated by
+the parameter @var{except}.  The individual excepetions are described in
+@ref{Examining the FPU status word}.  Only the specified exceptions are
+enabled, the status of the other exceptions is not changed.
+
+The function returns the previous enabled exceptions in case the
+operation was successful, @code{-1} otherwise.
+@end deftypefun
+
+@comment fenv.h
+@comment GNU
+@deftypefun int fedisableexcept (int @var{excepts})
+This functions disables traps for each of the exceptions as indicated by
+the parameter @var{except}.  The individual excepetions are described in
+@ref{Examining the FPU status word}.  Only the specified exceptions are
+disabled, the status of the other exceptions is not changed.
+
+The function returns the previous enabled exceptions in case the
+operation was successful, @code{-1} otherwise.
+@end deftypefun
+
+@comment fenv.h
+@comment GNU
+@deftypefun int fegetexcept (int @var{excepts})
+The function returns a bitmask of all currently enabled exceptions.  It
+returns @code{-1} in case of failure.
+
 @node Arithmetic Functions
 @section Arithmetic Functions
 
diff --git a/math/Makefile b/math/Makefile
index bc2e7b9307..f9f0ce4790 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -39,7 +39,8 @@ extra-libs-others = $(extra-libs)
 libm-support = k_standard s_lib_version s_matherr s_signgam		\
 	       fclrexcpt fgetexcptflg fraiseexcpt fsetexcptflg		\
 	       ftestexcept fegetround fesetround fegetenv feholdexcpt	\
-	       fesetenv feupdateenv t_exp
+	       fesetenv feupdateenv t_exp fedisblxcpt feenablxcpt	\
+	       fegetexcept
 libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod	\
 	     e_hypot e_j0 e_j1 e_jn e_lgamma_r e_log e_log10 e_pow	\
 	     e_rem_pio2 e_remainder e_scalb e_sinh e_sqrt e_gamma_r	\
diff --git a/math/Versions b/math/Versions
index 2be65529c9..99064cee68 100644
--- a/math/Versions
+++ b/math/Versions
@@ -158,4 +158,8 @@ libm {
     feclearexcept; fegetenv; fegetexceptflag; feraiseexcept;
     fesetenv; fesetexceptflag; feupdateenv;
   }
+  GLIBC_2.2 {
+    # fp environment function
+    feenableexcept; fedisableexcept; fegetexcept;
+  }
 }
diff --git a/math/fenv.h b/math/fenv.h
index 845b5e637f..bda3ee916f 100644
--- a/math/fenv.h
+++ b/math/fenv.h
@@ -115,6 +115,22 @@ extern int feupdateenv (__const fenv_t *__envp) __THROW;
 # include <bits/fenvinline.h>
 #endif
 
+#ifdef __USE_GNU
+
+/* Enable individual exceptions.  Will not enable more exceptions than
+   EXCEPTS specifies.  Returns the previous enabled exceptions if all
+   exceptions are successfull set, otherwise returns -1.  */
+extern int feenableexcept (int __excepts) __THROW;
+
+/* Disable individual exceptions.  Will not disable more exceptions than
+   EXCEPTS specifies.  Returns the previous enabled exceptions if all
+   exceptions are successfull disabled, otherwise returns -1.  */
+extern int fedisableexcept (int __excepts) __THROW;
+
+/* Return enabled exceptions.  */
+extern int fegetexcept (void) __THROW;
+#endif
+
 __END_DECLS
 
 #endif /* fenv.h */
diff --git a/sysdeps/generic/fedisblxcpt.c b/sysdeps/generic/fedisblxcpt.c
new file mode 100644
index 0000000000..0605fd82d0
--- /dev/null
+++ b/sysdeps/generic/fedisblxcpt.c
@@ -0,0 +1,30 @@
+/* Disable floating-point exceptions.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+fedisableexcept (int excepts)
+{
+  /* Signal failure.  */
+  return -1;
+}
+stub_warning (fedisableexcept)
+#include <stub-tag.h>
diff --git a/sysdeps/generic/feenablxcpt.c b/sysdeps/generic/feenablxcpt.c
new file mode 100644
index 0000000000..08a832b166
--- /dev/null
+++ b/sysdeps/generic/feenablxcpt.c
@@ -0,0 +1,30 @@
+/* Enable floating-point exceptions.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+feenableexcept (int excepts)
+{
+  /* Signal failure.  */
+  return -1;
+}
+stub_warning (feenableexcept)
+#include <stub-tag.h>
diff --git a/sysdeps/generic/fegetexcept.c b/sysdeps/generic/fegetexcept.c
new file mode 100644
index 0000000000..32cc0142b3
--- /dev/null
+++ b/sysdeps/generic/fegetexcept.c
@@ -0,0 +1,30 @@
+/* Get floating-point exceptions.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+fegetexcept (void)
+{
+  /* Signal failure.  */
+  return -1;
+}
+stub_warning (fegetexcept)
+#include <stub-tag.h>
diff --git a/sysdeps/i386/fpu/fedisblxcpt.c b/sysdeps/i386/fpu/fedisblxcpt.c
new file mode 100644
index 0000000000..0cb570f562
--- /dev/null
+++ b/sysdeps/i386/fpu/fedisblxcpt.c
@@ -0,0 +1,39 @@
+/* Disable floating-point exceptions.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+fedisableexcept (int excepts)
+{
+  unsigned short int new_exc, old_exc;
+  
+  /* Get the current control word.  */
+  __asm__ ("fstcw %0" : "=m" (*&new_exc));
+  
+  old_exc = new_exc & FE_ALL_EXCEPT;
+
+  excepts &= FE_ALL_EXCEPT;
+  
+  new_exc &= ~excepts;
+  __asm__ ("fldcw %0" : : "m" (*&new_exc));
+
+  return old_exc;
+}
diff --git a/sysdeps/i386/fpu/feenablxcpt.c b/sysdeps/i386/fpu/feenablxcpt.c
new file mode 100644
index 0000000000..b9877d4e14
--- /dev/null
+++ b/sysdeps/i386/fpu/feenablxcpt.c
@@ -0,0 +1,38 @@
+/* Enable floating-point exceptions.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+feenableexcept (int excepts)
+{
+  unsigned short int new_exc, old_exc;
+
+  /* Get the current control word.  */
+  __asm__ ("fstcw %0" : "=m" (*&new_exc));
+
+  excepts &= FE_ALL_EXCEPT;
+  old_exc = new_exc & FE_ALL_EXCEPT;
+
+  new_exc |= excepts;
+  __asm__ ("fldcw %0" : : "m" (*&new_exc));
+
+  return old_exc;
+}
diff --git a/sysdeps/i386/fpu/fegetexcept.c b/sysdeps/i386/fpu/fegetexcept.c
new file mode 100644
index 0000000000..310a717d97
--- /dev/null
+++ b/sysdeps/i386/fpu/fegetexcept.c
@@ -0,0 +1,32 @@
+/* Get enabled floating-point exceptions.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+fegetexcept (void)
+{
+  unsigned short int exc;
+
+  /* Get the current control word.  */
+  __asm__ ("fstcw %0" : "=m" (*&exc));
+
+  return exc & FE_ALL_EXCEPT;
+}