From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 10/12] x86: Do not raise inexact exception on floor/floorf
Date: Thu, 28 Dec 2023 14:20:24 -0300 [thread overview]
Message-ID: <20231228172026.2013007-11-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20231228172026.2013007-1-adhemerval.zanella@linaro.org>
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
diff --git a/sysdeps/i386/fpu/s_floor.S b/sysdeps/i386/fpu/s_floor.S
deleted file mode 100644
index 7143fdcc9a..0000000000
--- a/sysdeps/i386/fpu/s_floor.S
+++ /dev/null
@@ -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)
diff --git a/sysdeps/i386/fpu/s_floor.c b/sysdeps/i386/fpu/s_floor.c
new file mode 100644
index 0000000000..90ba61da92
--- /dev/null
+++ b/sysdeps/i386/fpu/s_floor.c
@@ -0,0 +1,38 @@
+/* Return largest integral value not less than argument. i386 version.
+ Copyright (C) 2023 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)
diff --git a/sysdeps/i386/fpu/s_floorf.S b/sysdeps/i386/fpu/s_floorf.S
deleted file mode 100644
index 8fad9c0698..0000000000
--- a/sysdeps/i386/fpu/s_floorf.S
+++ /dev/null
@@ -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)
diff --git a/sysdeps/i386/fpu/s_floorf.c b/sysdeps/i386/fpu/s_floorf.c
new file mode 100644
index 0000000000..0e7e8223a8
--- /dev/null
+++ b/sysdeps/i386/fpu/s_floorf.c
@@ -0,0 +1,38 @@
+/* Return largest integral value not less than argument. i386 version.
+ Copyright (C) 2023 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)
--
2.34.1
next prev parent reply other threads:[~2023-12-28 17:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-28 17:20 [PATCH 00/12] Improve rounding to interger function for C23 Adhemerval Zanella
2023-12-28 17:20 ` [PATCH 01/12] math: Reformat Makefile Adhemerval Zanella
2024-04-01 13:57 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 02/12] powerpc: Add missing arch flags on rounding ifunc variants Adhemerval Zanella
2024-04-01 13:59 ` H.J. Lu
2024-04-01 16:50 ` Peter Bergner
2023-12-28 17:20 ` [PATCH 03/12] math: Add test to check if ceil raise inexact floating-point exception Adhemerval Zanella
2024-04-01 14:01 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 04/12] math: Add test to check if floor " Adhemerval Zanella
2024-04-01 14:02 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 05/12] math: Add test to check if trunc " Adhemerval Zanella
2024-04-01 14:03 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 06/12] math: Add test to check if round " Adhemerval Zanella
2024-04-01 14:02 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 07/12] x86: Do not raise inexact exception on ceill Adhemerval Zanella
2024-04-01 14:12 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 08/12] x86: Do not raise inexact exception on floorl Adhemerval Zanella
2024-04-01 14:13 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 09/12] x86: Do not raise inexact exception on truncl Adhemerval Zanella
2024-04-01 14:14 ` H.J. Lu
2023-12-28 17:20 ` Adhemerval Zanella [this message]
2024-04-01 14:15 ` [PATCH 10/12] x86: Do not raise inexact exception on floor/floorf H.J. Lu
2023-12-28 17:20 ` [PATCH 11/12] i386: Do not raise inexact exception on ceil/ceilf Adhemerval Zanella
2024-04-01 14:16 ` H.J. Lu
2023-12-28 17:20 ` [PATCH 12/12] i386: Do not raise inexact exception on trunc/truncf Adhemerval Zanella
2024-04-01 14:17 ` H.J. Lu
2024-02-16 17:47 ` [PATCH 00/12] Improve rounding to interger function for C23 Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231228172026.2013007-11-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).