From 2e585820919bfbd057be2c65483fc3e026c030b6 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 21 Feb 2003 16:18:50 +0000 Subject: * sysdeps/x86_64/fpu/fesetenv.c (fesetenv): Fix setting of default mode. * sysdeps/x86_64/fpu/fsetexcptflg.c (fesetexceptflag): Do not clear whole mxcsr but only exceptions. --- sysdeps/x86_64/fpu/fesetenv.c | 17 ++++++++--------- sysdeps/x86_64/fpu/fsetexcptflg.c | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'sysdeps/x86_64/fpu') diff --git a/sysdeps/x86_64/fpu/fesetenv.c b/sysdeps/x86_64/fpu/fesetenv.c index 68e0046..8a3b7a0 100644 --- a/sysdeps/x86_64/fpu/fesetenv.c +++ b/sysdeps/x86_64/fpu/fesetenv.c @@ -1,5 +1,5 @@ /* Install given floating-point environment. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 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 @@ -45,10 +45,9 @@ fesetenv (const fenv_t *envp) temp.__data_selector = 0; /* Set mask for SSE MXCSR. */ temp.__mxcsr |= (FE_ALL_EXCEPT << 7); - /* Set rounding to FE_TOWARDZERO. */ - temp.__mxcsr &= ~(FE_TOWARDZERO << 3); - /* Disable exceptions. */ - temp.__mxcsr &= ~FE_ALL_EXCEPT; + /* Set rounding to FE_TONEAREST. */ + temp.__mxcsr &= ~ 0x6000; + temp.__mxcsr |= (FE_TONEAREST << 3); } else if (envp == FE_NOMASK_ENV) { @@ -60,11 +59,11 @@ fesetenv (const fenv_t *envp) temp.__data_offset = 0; temp.__data_selector = 0; /* Set mask for SSE MXCSR. */ + /* Set rounding to FE_TONEAREST. */ + temp.__mxcsr &= ~ 0x6000; + temp.__mxcsr |= (FE_TONEAREST << 3); + /* Do not mask exceptions. */ temp.__mxcsr &= ~(FE_ALL_EXCEPT << 7); - /* Set rounding to FE_TOWARDZERO. */ - temp.__mxcsr &= ~(FE_TOWARDZERO << 3); - /* Disable exceptions. */ - temp.__mxcsr &= ~FE_ALL_EXCEPT; } else { diff --git a/sysdeps/x86_64/fpu/fsetexcptflg.c b/sysdeps/x86_64/fpu/fsetexcptflg.c index fc4a42c..fe1d406 100644 --- a/sysdeps/x86_64/fpu/fsetexcptflg.c +++ b/sysdeps/x86_64/fpu/fsetexcptflg.c @@ -1,5 +1,5 @@ /* Set floating-point environment exception handling. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 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 @@ -44,7 +44,7 @@ fesetexceptflag (const fexcept_t *flagp, int excepts) /* And now the same for SSE. */ __asm__ ("stmxcsr %0" : "=m" (*&mxcsr)); - mxcsr &= (excepts & FE_ALL_EXCEPT); + mxcsr &= ~(excepts & FE_ALL_EXCEPT); mxcsr |= *flagp & excepts & FE_ALL_EXCEPT; __asm__ ("ldmxcsr %0" : : "m" (*&mxcsr)); -- cgit v1.1