aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/i386/fpu/Makefile3
-rw-r--r--sysdeps/i386/fpu/fedisblxcpt.c18
-rw-r--r--sysdeps/i386/fpu/feenablxcpt.c21
-rw-r--r--sysdeps/i386/fpu/feholdexcpt.c19
-rw-r--r--sysdeps/i386/fpu/fesetround.c16
6 files changed, 81 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c1bb873297..9d6556bdc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-29 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/i386/fpu/Makefile: New file.
+ * sysdeps/i386/fpu/fedisblxcpt.c: Also set SSE control word.
+ * sysdeps/i386/fpu/feenablxcpt.c: Likewise.
+ * sysdeps/i386/fpu/feholdexcpt.c: Likewise.
+ * sysdeps/i386/fpu/fesetround.c: Also set SSE rounding mode
+ [PR libc/4987].
+
2003-04-28 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd_getgr_r.c: Compact code a bit. Add some __builtin_expect.
diff --git a/sysdeps/i386/fpu/Makefile b/sysdeps/i386/fpu/Makefile
new file mode 100644
index 0000000000..1309b64c13
--- /dev/null
+++ b/sysdeps/i386/fpu/Makefile
@@ -0,0 +1,3 @@
+ifeq ($(subdir),math)
+$(objpfx)libm.so: $(elfobjdir)/ld.so
+endif
diff --git a/sysdeps/i386/fpu/fedisblxcpt.c b/sysdeps/i386/fpu/fedisblxcpt.c
index c7f76f53a9..754d20d4c8 100644
--- a/sysdeps/i386/fpu/fedisblxcpt.c
+++ b/sysdeps/i386/fpu/fedisblxcpt.c
@@ -1,5 +1,5 @@
/* Disable floating-point exceptions.
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 1999.
@@ -19,6 +19,9 @@
02111-1307 USA. */
#include <fenv.h>
+#include <unistd.h>
+#include <ldsodefs.h>
+#include <dl-procinfo.h>
int
fedisableexcept (int excepts)
@@ -35,5 +38,18 @@ fedisableexcept (int excepts)
new_exc |= excepts;
__asm__ ("fldcw %0" : : "m" (*&new_exc));
+ /* If the CPU supports SSE we set the MXCSR as well. */
+ if ((GL(dl_hwcap_mask) & HWCAP_I386_XMM) != 0)
+ {
+ unsigned int xnew_exc;
+
+ /* Get the current control word. */
+ __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc));
+
+ xnew_exc |= excepts;
+
+ __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc));
+ }
+
return old_exc;
}
diff --git a/sysdeps/i386/fpu/feenablxcpt.c b/sysdeps/i386/fpu/feenablxcpt.c
index a672d0e821..65a0a2944c 100644
--- a/sysdeps/i386/fpu/feenablxcpt.c
+++ b/sysdeps/i386/fpu/feenablxcpt.c
@@ -1,5 +1,5 @@
/* Enable floating-point exceptions.
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 1999.
@@ -19,11 +19,15 @@
02111-1307 USA. */
#include <fenv.h>
+#include <unistd.h>
+#include <ldsodefs.h>
+#include <dl-procinfo.h>
int
feenableexcept (int excepts)
{
- unsigned short int new_exc, old_exc;
+ unsigned short int new_exc;
+ unsigned short int old_exc;
/* Get the current control word. */
__asm__ ("fstcw %0" : "=m" (*&new_exc));
@@ -34,5 +38,18 @@ feenableexcept (int excepts)
new_exc &= ~excepts;
__asm__ ("fldcw %0" : : "m" (*&new_exc));
+ /* If the CPU supports SSE we set the MXCSR as well. */
+ if ((GL(dl_hwcap_mask) & HWCAP_I386_XMM) != 0)
+ {
+ unsigned int xnew_exc;
+
+ /* Get the current control word. */
+ __asm__ ("ldmxcsr %0" : "=m" (*&xnew_exc));
+
+ xnew_exc &= ~excepts;
+
+ __asm__ ("stmxcsr %0" : : "m" (*&xnew_exc));
+ }
+
return old_exc;
}
diff --git a/sysdeps/i386/fpu/feholdexcpt.c b/sysdeps/i386/fpu/feholdexcpt.c
index b68ffa3244..bdbf9107e6 100644
--- a/sysdeps/i386/fpu/feholdexcpt.c
+++ b/sysdeps/i386/fpu/feholdexcpt.c
@@ -1,5 +1,5 @@
/* Store current floating-point environment and clear exceptions.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -19,6 +19,9 @@
02111-1307 USA. */
#include <fenv.h>
+#include <unistd.h>
+#include <ldsodefs.h>
+#include <dl-procinfo.h>
int
feholdexcept (fenv_t *envp)
@@ -32,5 +35,19 @@ feholdexcept (fenv_t *envp)
work = envp->__control_word | 0x3f;
__asm__ ("fldcw %0" : : "m" (*&work));
+ /* If the CPU supports SSE we set the MXCSR as well. */
+ if ((GL(dl_hwcap_mask) & HWCAP_I386_XMM) != 0)
+ {
+ unsigned int xwork;
+
+ /* Get the current control word. */
+ __asm__ ("stmxcsr %0" : "=m" (*&xwork));
+
+ /* Set all exceptions to non-stop. */
+ work |= 0x1f80;
+
+ __asm__ ("ldmxcsr %0" : : "m" (*&xwork));
+ }
+
return 0;
}
diff --git a/sysdeps/i386/fpu/fesetround.c b/sysdeps/i386/fpu/fesetround.c
index 342ae49c60..342ed42318 100644
--- a/sysdeps/i386/fpu/fesetround.c
+++ b/sysdeps/i386/fpu/fesetround.c
@@ -1,5 +1,5 @@
/* Set current rounding direction.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -19,6 +19,9 @@
02111-1307 USA. */
#include <fenv.h>
+#include <unistd.h>
+#include <ldsodefs.h>
+#include <dl-procinfo.h>
int
fesetround (int round)
@@ -34,5 +37,16 @@ fesetround (int round)
cw |= round;
__asm__ ("fldcw %0" : : "m" (*&cw));
+ /* If the CPU supports SSE we set the MXCSR as well. */
+ if ((GL(dl_hwcap_mask) & HWCAP_I386_XMM) != 0)
+ {
+ unsigned int xcw;
+
+ __asm__ ("stmxcsr %0" : "=m" (*&xcw));
+ cw &= ~0x6000;
+ cw |= round << 3;
+ __asm__ ("ldmxcsr %0" : : "m" (*&xcw));
+ }
+
return 0;
}