diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-11-16 12:45:11 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-11-16 12:45:11 +0000 |
| commit | 66294491665029eff0cf3ebd5fb6f04582da6c1e (patch) | |
| tree | 5d398338d64b21bba5eb702a543cfd456c46418a /sysdeps/i386 | |
| parent | b46d046e7bf7e0f96e41e522da731b89177e31ab (diff) | |
| download | glibc-66294491665029eff0cf3ebd5fb6f04582da6c1e.tar.gz glibc-66294491665029eff0cf3ebd5fb6f04582da6c1e.tar.xz glibc-66294491665029eff0cf3ebd5fb6f04582da6c1e.zip | |
Fix spurious "inexact" exceptions from x86 pow with NaN argument (bug 16167).
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/fpu/e_pow.S | 9 | ||||
| -rw-r--r-- | sysdeps/i386/fpu/e_powf.S | 5 | ||||
| -rw-r--r-- | sysdeps/i386/fpu/e_powl.S | 9 |
3 files changed, 22 insertions, 1 deletions
diff --git a/sysdeps/i386/fpu/e_pow.S b/sysdeps/i386/fpu/e_pow.S index 109c395934..835c39b7bd 100644 --- a/sysdeps/i386/fpu/e_pow.S +++ b/sysdeps/i386/fpu/e_pow.S @@ -98,6 +98,9 @@ ENTRY(__ieee754_pow) cmpb $0x05, %ah je 15f // x is ħinf + cmpb $0x01, %ah + je 32f // x is NaN + fxch // y : x /* fistpll raises invalid exception for |y| >= 1L<<63. */ @@ -166,6 +169,12 @@ ENTRY(__ieee754_pow) ret cfi_adjust_cfa_offset (8) +32: addl $8, %esp + cfi_adjust_cfa_offset (-8) + fstp %st(1) + ret + + cfi_adjust_cfa_offset (8) .align ALIGNARG(4) 2: // y is a large integer (absolute value at least 1L<<10), but // may be odd unless at least 1L<<64. So it may be necessary diff --git a/sysdeps/i386/fpu/e_powf.S b/sysdeps/i386/fpu/e_powf.S index 7fad90f6cb..90d3d0ca6a 100644 --- a/sysdeps/i386/fpu/e_powf.S +++ b/sysdeps/i386/fpu/e_powf.S @@ -95,6 +95,9 @@ ENTRY(__ieee754_powf) cmpb $0x05, %ah je 15f // x is ħinf + cmpb $0x01, %ah + je 32f // x is NaN + fxch // y : x /* fistpl raises invalid exception for |y| >= 1L<<31. */ @@ -180,7 +183,7 @@ ENTRY(__ieee754_powf) f2xm1 // 2^fract(y*log2(x))-1 : int(y*log2(x)) faddl MO(one) // 2^fract(y*log2(x)) : int(y*log2(x)) fscale // 2^fract(y*log2(x))*2^int(y*log2(x)) : int(y*log2(x)) - addl $4, %esp +32: addl $4, %esp cfi_adjust_cfa_offset (-4) fstp %st(1) // 2^fract(y*log2(x))*2^int(y*log2(x)) ret diff --git a/sysdeps/i386/fpu/e_powl.S b/sysdeps/i386/fpu/e_powl.S index 3c23117c39..91e22c8a29 100644 --- a/sysdeps/i386/fpu/e_powl.S +++ b/sysdeps/i386/fpu/e_powl.S @@ -104,6 +104,9 @@ ENTRY(__ieee754_powl) cmpb $0x05, %ah je 15f // x is ħinf + cmpb $0x01, %ah + je 32f // x is NaN + fxch // y : x /* fistpll raises invalid exception for |y| >= 1L<<63. */ @@ -188,6 +191,12 @@ ENTRY(__ieee754_powl) ret cfi_adjust_cfa_offset (8) +32: addl $8, %esp + cfi_adjust_cfa_offset (-8) + fstp %st(1) + ret + + cfi_adjust_cfa_offset (8) .align ALIGNARG(4) 2: // y is a large integer (absolute value at least 8), but // may be odd unless at least 1L<<64. So it may be necessary |