From: "H.J. Lu" <hjl.tools@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH 12/12] i386: Do not raise inexact exception on trunc/truncf
Date: Mon, 1 Apr 2024 07:17:11 -0700 [thread overview]
Message-ID: <CAMe9rOpnUsHOAbkz44_gMU_UN_dYZkYc=a2DxviD+Z64zdCGoA@mail.gmail.com> (raw)
In-Reply-To: <20231228172026.2013007-13-adhemerval.zanella@linaro.org>
On Thu, Dec 28, 2023 at 9:23 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
> It is not allowed anymore on ISO C23.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
> ---
> sysdeps/i386/fpu/{s_trunc.S => s_trunc.c} | 37 +++++++++++----------
> sysdeps/i386/fpu/{s_truncf.S => s_truncf.c} | 37 +++++++++++----------
> 2 files changed, 38 insertions(+), 36 deletions(-)
> rename sysdeps/i386/fpu/{s_trunc.S => s_trunc.c} (61%)
> rename sysdeps/i386/fpu/{s_truncf.S => s_truncf.c} (61%)
>
> diff --git a/sysdeps/i386/fpu/s_trunc.S b/sysdeps/i386/fpu/s_trunc.c
> similarity index 61%
> rename from sysdeps/i386/fpu/s_trunc.S
> rename to sysdeps/i386/fpu/s_trunc.c
> index 145288bc8e..b071ad9750 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-2023 Free Software Foundation, Inc.
> +/* Round to integer, toward zero. i386 version.
> + Copyright (C) 2023 Free Software Foundation, Inc.
2024.
> 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,23 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <machine/asm.h>
> +#define NO_MATH_REDIRECT
> +#include <math.h>
> +#include <fenv_private.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)
> +double
> +__trunc (double x)
> +{
> + fenv_t fenv;
> + double r;
> +
> + libc_feholdexcept_setround_387 (&fenv, FE_TOWARDZERO);
> + 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 (__trunc, trunc)
> diff --git a/sysdeps/i386/fpu/s_truncf.S b/sysdeps/i386/fpu/s_truncf.c
> similarity index 61%
> rename from sysdeps/i386/fpu/s_truncf.S
> rename to sysdeps/i386/fpu/s_truncf.c
> index 7bdf0e5111..86d46ff660 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-2023 Free Software Foundation, Inc.
> +/* Round to integer, toward zero. i386 version.
> + Copyright (C) 2023 Free Software Foundation, Inc.
2024.
> 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,23 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <machine/asm.h>
> +#define NO_MATH_REDIRECT
> +#include <math.h>
> +#include <fenv_private.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)
> +float
> +__truncf (float x)
> +{
> + fenv_t fenv;
> + float r;
> +
> + libc_feholdexcept_setround_387 (&fenv, FE_TOWARDZERO);
> + 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 (__trunc, trunc)
> --
> 2.34.1
>
--
H.J.
next prev parent reply other threads:[~2024-04-01 14:17 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 ` [PATCH 10/12] x86: Do not raise inexact exception on floor/floorf Adhemerval Zanella
2024-04-01 14:15 ` 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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMe9rOpnUsHOAbkz44_gMU_UN_dYZkYc=a2DxviD+Z64zdCGoA@mail.gmail.com' \
--to=hjl.tools@gmail.com \
--cc=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).