Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / sysdeps / i386 / i686 / fpu / s_fmaxl.S

diff --git a/sysdeps/i386/i686/fpu/s_fmaxl.S b/sysdeps/i386/i686/fpu/s_fmaxl.S
index aaa07e75814ca8bfefeaf4098b82dfd234129bc9..97e4a0b42f57444f126bd7d4cee0ebae8b8e5791 100644 (file)
--- a/sysdeps/i386/i686/fpu/s_fmaxl.S
+++ b/sysdeps/i386/i686/fpu/s_fmaxl.S
@@ -1,5 +1,5 @@
 /* Compute maximum of two numbers, regarding NaN as missing argument.
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -15,25 +15,45 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
+#include <libm-alias-ldouble.h>
 
        .text
 ENTRY(__fmaxl)
        fldt    4(%esp)         // x
        fldt    16(%esp)        // x : y
 
-       fucomi  %st(0), %st
-       fcmovu  %st(1), %st     // now %st contains y if not NaN, x otherwise
-
-       fxch
-
        fucomi  %st(1), %st
+       jp      2f
        fcmovb  %st(1), %st
 
        fstp    %st(1)
 
        ret
+
+2:     // Unordered.
+       fucomi  %st(0), %st
+       jp      3f
+       // st(1) is a NaN; st(0) is not.  Test if st(1) is signaling.
+       testb   $0x40, 11(%esp)
+       jz      4f
+       fstp    %st(1)
+       ret
+
+3:     // st(0) is a NaN; st(1) may or may not be.
+       fxch
+       fucomi  %st(0), %st
+       jp      4f
+       // st(1) is a NaN; st(0) is not.  Test if st(1) is signaling.
+       testb   $0x40, 23(%esp)
+       jz      4f
+       fstp    %st(1)
+       ret
+
+4:     // Both arguments are NaNs, or one is a signaling NaN.
+       faddp
+       ret
 END(__fmaxl)
-weak_alias (__fmaxl, fmaxl)
+libm_alias_ldouble (__fmax, fmax)