aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-04-03 16:39:19 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-04-04 14:29:28 -0300
commit44ccc2465c6af5bd811d8258bf744aaafd5392fc (patch)
tree3332a0e1abbcdb99c685166da356357ff1076327 /sysdeps/i386
parent932544efa469568525455bcb53d4eabeba0eb295 (diff)
downloadglibc-44ccc2465c6af5bd811d8258bf744aaafd5392fc.zip
glibc-44ccc2465c6af5bd811d8258bf744aaafd5392fc.tar.gz
glibc-44ccc2465c6af5bd811d8258bf744aaafd5392fc.tar.bz2
math: x86 trunc traps when FE_INEXACT is enabled (BZ 31603)
The implementations of trunc functions using x87 floating point (i386 and x86_64 long double only) traps when FE_INEXACT is enabled. Although this is a GNU extension outside the scope of the C standard, other architectures that also support traps do not show this behavior. The fix moves the implementation to a common one that holds any exceptions with a 'fnclex' (libc_feholdexcept_setround_387). Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/fpu/s_trunc.c (renamed from sysdeps/i386/fpu/s_trunc.S)24
-rw-r--r--sysdeps/i386/fpu/s_truncf.c (renamed from sysdeps/i386/fpu/s_truncf.S)24
-rw-r--r--sysdeps/i386/fpu/s_truncl.S40
3 files changed, 12 insertions, 76 deletions
diff --git a/sysdeps/i386/fpu/s_trunc.S b/sysdeps/i386/fpu/s_trunc.c
index 40e45c9..ac16f49 100644
--- a/sysdeps/i386/fpu/s_trunc.S
+++ b/sysdeps/i386/fpu/s_trunc.c
@@ -1,5 +1,5 @@
-/* Truncate double value.
- Copyright (C) 1997-2024 Free Software Foundation, Inc.
+/* Round to integer, toward zero. i386 version.
+ Copyright (C) 2024 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
@@ -16,22 +16,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <machine/asm.h>
#include <libm-alias-double.h>
-ENTRY(__trunc)
- fldl 4(%esp)
- subl $32, %esp
- cfi_adjust_cfa_offset (32)
- fnstenv 4(%esp)
- movl $0xc00, %edx
- orl 4(%esp), %edx
- movl %edx, (%esp)
- fldcw (%esp)
- frndint
- fldenv 4(%esp)
- addl $32, %esp
- cfi_adjust_cfa_offset (-32)
- ret
-END(__trunc)
+#define FUNC __trunc
+#define TYPE double
+#define FE_OPTION FE_TOWARDZERO
+#include "s_nearestint_387_template.c"
libm_alias_double (__trunc, trunc)
diff --git a/sysdeps/i386/fpu/s_truncf.S b/sysdeps/i386/fpu/s_truncf.c
index 0b26e09..240d350 100644
--- a/sysdeps/i386/fpu/s_truncf.S
+++ b/sysdeps/i386/fpu/s_truncf.c
@@ -1,5 +1,5 @@
-/* Truncate float value.
- Copyright (C) 1997-2024 Free Software Foundation, Inc.
+/* Round to integer, toward zero. i386 version.
+ Copyright (C) 2024 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
@@ -16,22 +16,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <machine/asm.h>
#include <libm-alias-float.h>
-ENTRY(__truncf)
- flds 4(%esp)
- subl $32, %esp
- cfi_adjust_cfa_offset (32)
- fnstenv 4(%esp)
- movl $0xc00, %edx
- orl 4(%esp), %edx
- movl %edx, (%esp)
- fldcw (%esp)
- frndint
- fldenv 4(%esp)
- addl $32, %esp
- cfi_adjust_cfa_offset (-32)
- ret
-END(__truncf)
+#define FUNC __truncf
+#define TYPE float
+#define FE_OPTION FE_TOWARDZERO
+#include "s_nearestint_387_template.c"
libm_alias_float (__trunc, trunc)
diff --git a/sysdeps/i386/fpu/s_truncl.S b/sysdeps/i386/fpu/s_truncl.S
deleted file mode 100644
index dfd0ca4..0000000
--- a/sysdeps/i386/fpu/s_truncl.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Truncate long double value.
- Copyright (C) 1997-2024 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, see
- <https://www.gnu.org/licenses/>. */
-
-#include <libm-alias-ldouble.h>
-#include <machine/asm.h>
-
-ENTRY(__truncl)
- fldt 4(%esp)
- subl $32, %esp
- cfi_adjust_cfa_offset (32)
- fnstenv 4(%esp)
- movl $0xc00, %edx
- orl 4(%esp), %edx
- movl %edx, (%esp)
- fldcw (%esp)
- frndint
- fnstsw
- andl $0x1, %eax
- orl %eax, 8(%esp)
- fldenv 4(%esp)
- addl $32, %esp
- cfi_adjust_cfa_offset (-32)
- ret
-END(__truncl)
-libm_alias_ldouble (__trunc, trunc)