From 76da7265320010c7a273ed99f53938c0f32d5fad Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 11 Apr 2012 16:30:13 -0300 Subject: Fix ilogb exception and errno (bug 6794) [BZ #6794] Following Joseph comments about bug 6794, here is a proposed fix. It turned out to be a large fix mainly because I had to move some file along to follow libm files/names conventions. Basically I have added wrappers (w_ilogb.c, w_ilogbf.c, w_ilogbl.c) that now calls the symbol '__ieee754_ilogb'. The wrappers checks for '__ieee754_ilogb' output and set the errno and raise exceptions as expected. The '__ieee754_ilogb' is implemented in sysdeps. I have moved the 's_ilogb[f|l]' files to e_ilogb[f|l] and renamed the '__ilogb[f|l]' to '__ieee754_ilogb[f|l]'. I also found out a bug in i386 and x86-64 assembly coded ilogb implementation where it raises a FE_DIVBYZERO when argument is '0.0'. I corrected this issue as well. Finally I added the errno and FE_INVALID tests for 0.0, NaN and +-InF argument. Tested on i386, x86-64, ppc32 and ppc64. --- sysdeps/i386/fpu/e_ilogb.S | 43 +++++++++++++++++++++++++++++++++++++++++++ sysdeps/i386/fpu/e_ilogbf.S | 43 +++++++++++++++++++++++++++++++++++++++++++ sysdeps/i386/fpu/e_ilogbl.S | 44 ++++++++++++++++++++++++++++++++++++++++++++ sysdeps/i386/fpu/s_ilogb.S | 38 -------------------------------------- sysdeps/i386/fpu/s_ilogbf.S | 38 -------------------------------------- sysdeps/i386/fpu/s_ilogbl.S | 39 --------------------------------------- 6 files changed, 130 insertions(+), 115 deletions(-) create mode 100644 sysdeps/i386/fpu/e_ilogb.S create mode 100644 sysdeps/i386/fpu/e_ilogbf.S create mode 100644 sysdeps/i386/fpu/e_ilogbl.S delete mode 100644 sysdeps/i386/fpu/s_ilogb.S delete mode 100644 sysdeps/i386/fpu/s_ilogbf.S delete mode 100644 sysdeps/i386/fpu/s_ilogbl.S (limited to 'sysdeps/i386') diff --git a/sysdeps/i386/fpu/e_ilogb.S b/sysdeps/i386/fpu/e_ilogb.S new file mode 100644 index 0000000..4fb6350 --- /dev/null +++ b/sysdeps/i386/fpu/e_ilogb.S @@ -0,0 +1,43 @@ +/* + * Written by J.T. Conklin . + * Public domain. + */ + +#include + +RCSID("$NetBSD: s_ilogb.S,v 1.5 1995/10/12 15:53:09 jtc Exp $") + +ENTRY(__ieee754_ilogb) + fldl 4(%esp) +/* I added the following ugly construct because ilogb(+-Inf) is + required to return INT_MAX in ISO C99. + -- jakub@redhat.com. */ + fxam /* Is NaN or +-Inf? */ + fstsw %ax + movb $0x45, %dh + andb %ah, %dh + cmpb $0x05, %dh + je 1f /* Is +-Inf, jump. */ + cmpb $0x40, %dh + je 2f /* Is +-0, jump. */ + + fxtract + pushl %eax + cfi_adjust_cfa_offset (4) + fstp %st + + fistpl (%esp) + fwait + popl %eax + cfi_adjust_cfa_offset (-4) + + ret + +1: fstp %st + movl $0x7fffffff, %eax + ret +2: fstp %st + movl $0x80000000, %eax /* FP_ILOGB0 */ + ret +END (__ieee754_ilogb) +weak_alias (__ieee754_ilogb, __ilogb_finite) diff --git a/sysdeps/i386/fpu/e_ilogbf.S b/sysdeps/i386/fpu/e_ilogbf.S new file mode 100644 index 0000000..fbb50be --- /dev/null +++ b/sysdeps/i386/fpu/e_ilogbf.S @@ -0,0 +1,43 @@ +/* + * Written by J.T. Conklin . + * Public domain. + */ + +#include + +RCSID("$NetBSD: s_ilogbf.S,v 1.4 1995/10/22 20:32:43 pk Exp $") + +ENTRY(__ieee754_ilogbf) + flds 4(%esp) +/* I added the following ugly construct because ilogb(+-Inf) is + required to return INT_MAX in ISO C99. + -- jakub@redhat.com. */ + fxam /* Is NaN or +-Inf? */ + fstsw %ax + movb $0x45, %dh + andb %ah, %dh + cmpb $0x05, %dh + je 1f /* Is +-Inf, jump. */ + cmpb $0x40, %dh + je 2f /* Is +-0, jump. */ + + fxtract + pushl %eax + cfi_adjust_cfa_offset (4) + fstp %st + + fistpl (%esp) + fwait + popl %eax + cfi_adjust_cfa_offset (-4) + + ret + +1: fstp %st + movl $0x7fffffff, %eax + ret +2: fstp %st + movl $0x80000000, %eax /* FP_ILOGB0 */ + ret +END (__ieee754_ilogbf) +weak_alias (__ieee754_ilogbf, __ilogbf_finite) diff --git a/sysdeps/i386/fpu/e_ilogbl.S b/sysdeps/i386/fpu/e_ilogbl.S new file mode 100644 index 0000000..6e2be9a --- /dev/null +++ b/sysdeps/i386/fpu/e_ilogbl.S @@ -0,0 +1,44 @@ +/* + * Written by J.T. Conklin . + * Changes for long double by Ulrich Drepper + * Public domain. + */ + +#include + +RCSID("$NetBSD: $") + +ENTRY(__ieee754_ilogbl) + fldt 4(%esp) +/* I added the following ugly construct because ilogb(+-Inf) is + required to return INT_MAX in ISO C99. + -- jakub@redhat.com. */ + fxam /* Is NaN or +-Inf? */ + fstsw %ax + movb $0x45, %dh + andb %ah, %dh + cmpb $0x05, %dh + je 1f /* Is +-Inf, jump. */ + cmpb $0x40, %dh + je 2f /* Is +-0, jump. */ + + fxtract + pushl %eax + cfi_adjust_cfa_offset (4) + fstp %st + + fistpl (%esp) + fwait + popl %eax + cfi_adjust_cfa_offset (-4) + + ret + +1: fstp %st + movl $0x7fffffff, %eax + ret +2: fstp %st + movl $0x80000000, %eax /* FP_ILOGB0 */ + ret +END (__ieee754_ilogbl) +weak_alias (__ieee754_ilogbl, __ilogbl_finite) diff --git a/sysdeps/i386/fpu/s_ilogb.S b/sysdeps/i386/fpu/s_ilogb.S deleted file mode 100644 index 0cf1ad7..0000000 --- a/sysdeps/i386/fpu/s_ilogb.S +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -RCSID("$NetBSD: s_ilogb.S,v 1.5 1995/10/12 15:53:09 jtc Exp $") - -ENTRY(__ilogb) - fldl 4(%esp) -/* I added the following ugly construct because ilogb(+-Inf) is - required to return INT_MAX in ISO C99. - -- jakub@redhat.com. */ - fxam /* Is NaN or +-Inf? */ - fstsw %ax - movb $0x45, %dh - andb %ah, %dh - cmpb $0x05, %dh - je 1f /* Is +-Inf, jump. */ - - fxtract - pushl %eax - cfi_adjust_cfa_offset (4) - fstp %st - - fistpl (%esp) - fwait - popl %eax - cfi_adjust_cfa_offset (-4) - - ret - -1: fstp %st - movl $0x7fffffff, %eax - ret -END (__ilogb) -weak_alias (__ilogb, ilogb) diff --git a/sysdeps/i386/fpu/s_ilogbf.S b/sysdeps/i386/fpu/s_ilogbf.S deleted file mode 100644 index 99e53ed..0000000 --- a/sysdeps/i386/fpu/s_ilogbf.S +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -RCSID("$NetBSD: s_ilogbf.S,v 1.4 1995/10/22 20:32:43 pk Exp $") - -ENTRY(__ilogbf) - flds 4(%esp) -/* I added the following ugly construct because ilogb(+-Inf) is - required to return INT_MAX in ISO C99. - -- jakub@redhat.com. */ - fxam /* Is NaN or +-Inf? */ - fstsw %ax - movb $0x45, %dh - andb %ah, %dh - cmpb $0x05, %dh - je 1f /* Is +-Inf, jump. */ - - fxtract - pushl %eax - cfi_adjust_cfa_offset (4) - fstp %st - - fistpl (%esp) - fwait - popl %eax - cfi_adjust_cfa_offset (-4) - - ret - -1: fstp %st - movl $0x7fffffff, %eax - ret -END (__ilogbf) -weak_alias (__ilogbf, ilogbf) diff --git a/sysdeps/i386/fpu/s_ilogbl.S b/sysdeps/i386/fpu/s_ilogbl.S deleted file mode 100644 index 1f559b3..0000000 --- a/sysdeps/i386/fpu/s_ilogbl.S +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Written by J.T. Conklin . - * Changes for long double by Ulrich Drepper - * Public domain. - */ - -#include - -RCSID("$NetBSD: $") - -ENTRY(__ilogbl) - fldt 4(%esp) -/* I added the following ugly construct because ilogb(+-Inf) is - required to return INT_MAX in ISO C99. - -- jakub@redhat.com. */ - fxam /* Is NaN or +-Inf? */ - fstsw %ax - movb $0x45, %dh - andb %ah, %dh - cmpb $0x05, %dh - je 1f /* Is +-Inf, jump. */ - - fxtract - pushl %eax - cfi_adjust_cfa_offset (4) - fstp %st - - fistpl (%esp) - fwait - popl %eax - cfi_adjust_cfa_offset (-4) - - ret - -1: fstp %st - movl $0x7fffffff, %eax - ret -END (__ilogbl) -weak_alias (__ilogbl, ilogbl) -- cgit v1.1