From 11bf8ce1d6c28b4758cedeaea9558f6a071fe7d8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 22 Jul 2003 22:28:07 +0000 Subject: Update. 2003-07-22 H.J. Lu * elf/dl-support.c (_dl_hwcap): New variable. (_dl_aux_init): Initialize GL(dl_hwcap) for static binaries. * sysdeps/i386/fpu/fclrexcpt.c: Include , and . (__feclearexcept): Clear MXCSR if needed. * sysdeps/i386/fpu/fsetexcptflg.c: Likewise. * sysdeps/i386/fpu_control.h (_FPU_GETCW, _FPU_SETCW): Document that newer hardware needs more than these macros. * sysdeps/i386/setfpucw.c: New file. 2003-07-22 Jakub Jelinek * elf/Makefile (CFLAGS-ldconfig.c): Define IS_IN_ldconfig. * elf/ldconfig.c: Include dl-procinfo.c. (PROCINFO_CLASS): Define. * sysdeps/generic/ldsodefs.h (PROCINFO_CLASS): Define. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: New file. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: New file. * sysdeps/unix/sysv/linux/i386/dl-procinfo.c (PROCINFO_CLASS): Define if not yet defined. Use it instead of EXTERN. Undefine at the end of the file. * sysdeps/unix/sysv/linux/arm/dl-procinfo.c (PROCINFO_CLASS): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c (PROCINFO_CLASS): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c (PROCINFO_CLASS): Likewise. 2003-07-22 H.J. Lu * elf/ldconfig.c (main): Issue a fatal error if relative path is used to build cache. 2003-07-22 Ulrich Drepper * elf/readlib.c (process_file): Avoid possible overflow in assignment. --- sysdeps/i386/fpu/fclrexcpt.c | 18 ++++++++++++++ sysdeps/i386/fpu/fsetexcptflg.c | 19 ++++++++++++++ sysdeps/i386/fpu_control.h | 8 ++++-- sysdeps/i386/setfpucw.c | 55 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 sysdeps/i386/setfpucw.c (limited to 'sysdeps/i386') diff --git a/sysdeps/i386/fpu/fclrexcpt.c b/sysdeps/i386/fpu/fclrexcpt.c index c3e7c3ed48..f7ccd3acf6 100644 --- a/sysdeps/i386/fpu/fclrexcpt.c +++ b/sysdeps/i386/fpu/fclrexcpt.c @@ -19,6 +19,9 @@ 02111-1307 USA. */ #include +#include +#include +#include int __feclearexcept (int excepts) @@ -38,6 +41,21 @@ __feclearexcept (int excepts) /* Put the new data in effect. */ __asm__ ("fldenv %0" : : "m" (*&temp)); + /* If the CPU supports SSE, we clear the MXCSR as well. */ + if ((GL(dl_hwcap) & HWCAP_I386_XMM) != 0) + { + unsigned int xnew_exc; + + /* Get the current MXCSR. */ + __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); + + /* Clear the relevant bits. */ + xnew_exc &= excepts ^ FE_ALL_EXCEPT; + + /* Put the new data in effect. */ + __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); + } + /* Success. */ return 0; } diff --git a/sysdeps/i386/fpu/fsetexcptflg.c b/sysdeps/i386/fpu/fsetexcptflg.c index 2bfc736054..d262738b68 100644 --- a/sysdeps/i386/fpu/fsetexcptflg.c +++ b/sysdeps/i386/fpu/fsetexcptflg.c @@ -21,6 +21,9 @@ #include #include #include +#include +#include +#include int __fesetexceptflag (const fexcept_t *flagp, int excepts) @@ -39,6 +42,22 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts) the next floating-point instruction. */ __asm__ ("fldenv %0" : : "m" (*&temp)); + /* If the CPU supports SSE, we set the MXCSR as well. */ + if ((GL(dl_hwcap) & HWCAP_I386_XMM) != 0) + { + unsigned int xnew_exc; + + /* Get the current MXCSR. */ + __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); + + /* Set the relevant bits. */ + xnew_exc &= ~(excepts & FE_ALL_EXCEPT); + xnew_exc |= *flagp & excepts & FE_ALL_EXCEPT; + + /* Put the new data in effect. */ + __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); + } + /* Success. */ return 0; } diff --git a/sysdeps/i386/fpu_control.h b/sysdeps/i386/fpu_control.h index ed9bf388a8..e2d00467b7 100644 --- a/sysdeps/i386/fpu_control.h +++ b/sysdeps/i386/fpu_control.h @@ -1,5 +1,5 @@ /* FPU control word bits. i387 version. - Copyright (C) 1993,1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1993,1995-1998,2000,2001,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Olaf Flebbe. @@ -88,7 +88,11 @@ /* Type of the control word. */ typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); -/* Macros for accessing the hardware control word. */ +/* Macros for accessing the hardware control word. + + Note that the use of these macros is no sufficient anymore with + recent hardware. Some floating point operations are executed in + the SSE/SSE2 engines which have their own control and status register. */ #define _FPU_GETCW(cw) __asm__ ("fnstcw %0" : "=m" (*&cw)) #define _FPU_SETCW(cw) __asm__ ("fldcw %0" : : "m" (*&cw)) diff --git a/sysdeps/i386/setfpucw.c b/sysdeps/i386/setfpucw.c new file mode 100644 index 0000000000..0a6af25ddf --- /dev/null +++ b/sysdeps/i386/setfpucw.c @@ -0,0 +1,55 @@ +/* Set the FPU control word for x86. + Copyright (C) 2003 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 + 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 + +void +__setfpucw (fpu_control_t set) +{ + fpu_control_t cw; + + /* Fetch the current control word. */ + __asm__ ("fnstcw %0" : "=m" (*&cw)); + + /* 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; + + __asm__ ("fldcw %0" : : "m" (*&cw)); + + /* If the CPU supports SSE, we set the MXCSR as well. */ + if ((GL(dl_hwcap) & HWCAP_I386_XMM) != 0) + { + unsigned int xnew_exc; + + /* Get the current MXCSR. */ + __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); + + xnew_exc &= ~((0xc00 << 3) | (FE_ALL_EXCEPT << 7)); + xnew_exc |= ((set & 0xc00) << 3) | ((set & FE_ALL_EXCEPT) << 7); + + __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); + } +} -- cgit v1.2.3