[v2,08/10] x86: Do not raise inexact exception on floor/floorf
Checks
Context |
Check |
Description |
redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
Commit Message
It is not allowed anymore on ISO C23.
Checked on x86_64-linux-gnu and i686-linux-gnu.
---
sysdeps/i386/fpu/s_floor.S | 34 ---------------------------------
sysdeps/i386/fpu/s_floor.c | 38 +++++++++++++++++++++++++++++++++++++
sysdeps/i386/fpu/s_floorf.S | 34 ---------------------------------
sysdeps/i386/fpu/s_floorf.c | 38 +++++++++++++++++++++++++++++++++++++
4 files changed, 76 insertions(+), 68 deletions(-)
delete mode 100644 sysdeps/i386/fpu/s_floor.S
create mode 100644 sysdeps/i386/fpu/s_floor.c
delete mode 100644 sysdeps/i386/fpu/s_floorf.S
create mode 100644 sysdeps/i386/fpu/s_floorf.c
deleted file mode 100644
@@ -1,34 +0,0 @@
-/*
- * Public domain.
- */
-
-#include <machine/asm.h>
-#include <libm-alias-double.h>
-
-RCSID("$NetBSD: s_floor.S,v 1.4 1995/05/09 00:01:59 jtc Exp $")
-
-ENTRY(__floor)
- fldl 4(%esp)
- subl $32,%esp
- cfi_adjust_cfa_offset (32)
-
- fnstenv 4(%esp) /* store fpu environment */
-
- /* We use here %edx although only the low 1 bits are defined.
- But none of the operations should care and they are faster
- than the 16 bit operations. */
- movl $0x400,%edx /* round towards -oo */
- orl 4(%esp),%edx
- andl $0xf7ff,%edx
- movl %edx,(%esp)
- fldcw (%esp) /* load modified control word */
-
- frndint /* round */
-
- fldenv 4(%esp) /* restore original environment */
-
- addl $32,%esp
- cfi_adjust_cfa_offset (-32)
- ret
-END (__floor)
-libm_alias_double (__floor, floor)
new file mode 100644
@@ -0,0 +1,38 @@
+/* Return largest integral value not less than argument. 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
+ 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/>. */
+
+#define NO_MATH_REDIRECT
+#include <math.h>
+#include <fenv_private.h>
+#include <libm-alias-double.h>
+
+double
+__floor (double x)
+{
+ fenv_t fenv;
+ double r;
+
+ libc_feholdexcept_setround_387 (&fenv, FE_DOWNWARD);
+ asm volatile ("frndint" : "=t" (r) : "0" (x));
+ /* Preserve "invalid" exceptions from sNaN input. */
+ fenv.__status_word |= libc_fetestexcept_387 (FE_INVALID);
+ libc_fesetenv_387 (&fenv);
+
+ return r;
+}
+libm_alias_double (__floor, floor)
deleted file mode 100644
@@ -1,34 +0,0 @@
-/*
- * Public domain.
- */
-
-#include <machine/asm.h>
-#include <libm-alias-float.h>
-
-RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $")
-
-ENTRY(__floorf)
- flds 4(%esp)
- subl $32,%esp
- cfi_adjust_cfa_offset (32)
-
- fnstenv 4(%esp) /* store fpu environment */
-
- /* We use here %edx although only the low 1 bits are defined.
- But none of the operations should care and they are faster
- than the 16 bit operations. */
- movl $0x400,%edx /* round towards -oo */
- orl 4(%esp),%edx
- andl $0xf7ff,%edx
- movl %edx,(%esp)
- fldcw (%esp) /* load modified control word */
-
- frndint /* round */
-
- fldenv 4(%esp) /* restore original environment */
-
- addl $32,%esp
- cfi_adjust_cfa_offset (-32)
- ret
-END (__floorf)
-libm_alias_float (__floor, floor)
new file mode 100644
@@ -0,0 +1,38 @@
+/* Return largest integral value not less than argument. 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
+ 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/>. */
+
+#define NO_MATH_REDIRECT
+#include <math.h>
+#include <fenv_private.h>
+#include <libm-alias-float.h>
+
+float
+__floorf (float x)
+{
+ fenv_t fenv;
+ float r;
+
+ libc_feholdexcept_setround_387 (&fenv, FE_DOWNWARD);
+ asm volatile ("frndint" : "=t" (r) : "0" (x));
+ /* Preserve "invalid" exceptions from sNaN input. */
+ fenv.__status_word |= libc_fetestexcept_387 (FE_INVALID);
+ libc_fesetenv_387 (&fenv);
+
+ return r;
+}
+libm_alias_float (__floor, floor)